rpms
/
rust-libz-sys
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:epel9
Branches Tags
rpms:i10ce
rpms:epel10
rpms:i9ce
rpms:epel9
...
pull from: rpms:i10ce
Branches Tags
rpms:i10ce
rpms:epel10
rpms:i9ce
rpms:epel9

No commits in common. 'epel9' and 'i10ce' have entirely different histories.
epel9 ... i10ce

11 changed files with 367 additions and 333 deletions
Show Stats

16
.gitignore vendored
Unescape View File

@ -1,15 +1 @@
/libz-sys-1.0.18.crate SOURCES/libz-sys-1.1.20.crate
/libz-sys-1.0.20.crate
/libz-sys-1.0.22.crate
/libz-sys-1.0.23.crate
/libz-sys-1.0.24.crate
/libz-sys-1.0.25.crate
/libz-sys-1.1.0.crate
/libz-sys-1.1.2.crate
/libz-sys-1.1.3.crate
/libz-sys-1.1.5.crate
/libz-sys-1.1.6.crate
/libz-sys-1.1.8.crate
/libz-sys-1.1.9.crate
/libz-sys-1.1.12.crate
/libz-sys-1.1.14.crate

1
.rust-libz-sys.metadata
Unescape View File

@ -0,0 +1 @@
254603a064265c3f9a9e31f99295f1a4c6afd16b SOURCES/libz-sys-1.1.20.crate

172
0001-unconditionally-use-pkg-config-to-link-with-system-z.patch → SOURCES/0001-unconditionally-use-pkg-config-to-link-with-system-z.patch
Unescape View File

@ -1,19 +1,17 @@
From 7d6c389b4f3330696e737110bbb9f7c38101da55 Mon Sep 17 00:00:00 2001 From 3660391791ccadf584bcbfd0b9238fca13e52522 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com> From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 10 Jan 2024 17:12:19 +0100 Date: Wed, 25 Sep 2024 17:10:14 +0200
Subject: [PATCH] unconditionally use pkg-config to link with system zlib Subject: [PATCH] unconditionally use pkg-config to link with system zlib
--- ---
build.rs | 197 ++------------------------------------------------- build.rs | 243 +------------------------------------------------------
build_zng.rs | 60 ---------------- 1 file changed, 4 insertions(+), 239 deletions(-)
2 files changed, 4 insertions(+), 253 deletions(-)
delete mode 100644 build_zng.rs
diff --git a/build.rs b/build.rs diff --git a/build.rs b/build.rs
index 1368a12..8d1acf7 100644 index cab160a..8d1acf7 100644
--- a/build.rs --- a/build.rs
+++ b/build.rs +++ b/build.rs
@@ -1,198 +1,9 @@ @@ -1,244 +1,9 @@
-use std::env; -use std::env;
-use std::fs; -use std::fs;
-use std::path::PathBuf; -use std::path::PathBuf;
@ -21,17 +19,31 @@ index 1368a12..8d1acf7 100644
fn main() { fn main() {
- println!("cargo:rerun-if-env-changed=LIBZ_SYS_STATIC"); - println!("cargo:rerun-if-env-changed=LIBZ_SYS_STATIC");
println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=build.rs");
- println!("cargo:rerun-if-changed=zng/cmake.rs");
- println!("cargo:rerun-if-changed=zng/cc.rs");
-
- let host = env::var("HOST").unwrap(); - let host = env::var("HOST").unwrap();
- let target = env::var("TARGET").unwrap(); - let target = env::var("TARGET").unwrap();
- -
- let host_and_target_contain = |s| host.contains(s) && target.contains(s); - let host_and_target_contain = |s| host.contains(s) && target.contains(s);
- -
- let want_ng = cfg!(feature = "zlib-ng") && !cfg!(feature = "stock-zlib"); - let want_ng = cfg!(any(
- feature = "zlib-ng",
- feature = "zlib-ng-no-cmake-experimental-community-maintained"
- )) && !cfg!(feature = "stock-zlib");
- -
- if want_ng && target != "wasm32-unknown-unknown" { - if want_ng && target != "wasm32-unknown-unknown" {
- return build_zlib_ng(&target, true); - return build_zlib_ng(&target, true);
- } - }
- -
- // All android compilers should come with libz by default, so let's just use
- // the one already there. Likewise, Haiku always ships with libz, so we can
- // link to it even when cross-compiling.
- if target.contains("android") || target.contains("haiku") {
- println!("cargo:rustc-link-lib=z");
- return;
- }
-
- // Don't run pkg-config if we're linking statically (we'll build below) and - // Don't run pkg-config if we're linking statically (we'll build below) and
- // also don't run pkg-config on FreeBSD/DragonFly. That'll end up printing - // also don't run pkg-config on FreeBSD/DragonFly. That'll end up printing
- // `-L /usr/lib` which wreaks havoc with linking to an OpenSSL in /usr/local/lib - // `-L /usr/lib` which wreaks havoc with linking to an OpenSSL in /usr/local/lib
@ -51,7 +63,16 @@ index 1368a12..8d1acf7 100644
- .print_system_libs(false) - .print_system_libs(false)
- .probe("zlib"); - .probe("zlib");
- match zlib { - match zlib {
- Ok(_) => return, - Ok(zlib) => {
- if !zlib.include_paths.is_empty() {
- let paths = zlib
- .include_paths
- .iter()
- .map(|s| s.display().to_string())
- .collect::<Vec<_>>();
- println!("cargo:include={}", paths.join(","));
- }
- }
- Err(e) => { - Err(e) => {
- println!("cargo-warning={}", e.to_string()) - println!("cargo-warning={}", e.to_string())
- } - }
@ -64,14 +85,6 @@ index 1368a12..8d1acf7 100644
- } - }
- } - }
- -
- // All android compilers should come with libz by default, so let's just use
- // the one already there. Likewise, Haiku always ships with libz, so we can
- // link to it even when cross-compiling.
- if target.contains("android") || target.contains("haiku") {
- println!("cargo:rustc-link-lib=z");
- return;
- }
-
- let mut cfg = cc::Build::new(); - let mut cfg = cc::Build::new();
- -
- // Situations where we build unconditionally. - // Situations where we build unconditionally.
@ -83,11 +96,10 @@ index 1368a12..8d1acf7 100644
- // Apple platforms have libz.1.dylib, and it's usually available even when - // Apple platforms have libz.1.dylib, and it's usually available even when
- // cross compiling (via fat binary or in the target's Xcode SDK) - // cross compiling (via fat binary or in the target's Xcode SDK)
- let cross_compiling = target != host; - let cross_compiling = target != host;
- let apple_to_apple = host.contains("-apple-") && target.contains("-apple-");
- if target.contains("msvc") - if target.contains("msvc")
- || target.contains("pc-windows-gnu") - || target.contains("pc-windows-gnu")
- || want_static - || want_static
- || (cross_compiling && !apple_to_apple) - || (cross_compiling && !target.contains("-apple-"))
- { - {
- return build_zlib(&mut cfg, &target); - return build_zlib(&mut cfg, &target);
- } - }
@ -111,7 +123,7 @@ index 1368a12..8d1acf7 100644
- let lib = dst.join("lib"); - let lib = dst.join("lib");
- -
- cfg.warnings(false).out_dir(&lib).include("src/zlib"); - cfg.warnings(false).out_dir(&lib).include("src/zlib");
-
- cfg.file("src/zlib/adler32.c") - cfg.file("src/zlib/adler32.c")
- .file("src/zlib/compress.c") - .file("src/zlib/compress.c")
- .file("src/zlib/crc32.c") - .file("src/zlib/crc32.c")
@ -123,7 +135,7 @@ index 1368a12..8d1acf7 100644
- .file("src/zlib/trees.c") - .file("src/zlib/trees.c")
- .file("src/zlib/uncompr.c") - .file("src/zlib/uncompr.c")
- .file("src/zlib/zutil.c"); - .file("src/zlib/zutil.c");
-
- if !cfg!(feature = "libc") || target.starts_with("wasm32") { - if !cfg!(feature = "libc") || target.starts_with("wasm32") {
- cfg.define("Z_SOLO", None); - cfg.define("Z_SOLO", None);
- } else { - } else {
@ -181,13 +193,31 @@ index 1368a12..8d1acf7 100644
- println!("cargo:include={}/include", dst.to_str().unwrap()); - println!("cargo:include={}/include", dst.to_str().unwrap());
-} -}
- -
-#[cfg(not(feature = "zlib-ng"))] -#[cfg(any(
-fn build_zlib_ng(_target: &str, _compat: bool) {} - feature = "zlib-ng",
- feature = "zlib-ng-no-cmake-experimental-community-maintained"
-))]
-mod zng {
- #[cfg_attr(feature = "zlib-ng", path = "cmake.rs")]
- #[cfg_attr(
- all(
- feature = "zlib-ng-no-cmake-experimental-community-maintained",
- not(feature = "zlib-ng")
- ),
- path = "cc.rs"
- )]
- mod build_zng;
- -
-#[cfg(feature = "zlib-ng")] - pub(super) use build_zng::build_zlib_ng;
-mod build_zng; -}
-#[cfg(feature = "zlib-ng")] -
-use build_zng::build_zlib_ng; -fn build_zlib_ng(_target: &str, _compat: bool) {
- #[cfg(any(
- feature = "zlib-ng",
- feature = "zlib-ng-no-cmake-experimental-community-maintained"
- ))]
- zng::build_zlib_ng(_target, _compat);
-}
- -
-fn try_vcpkg() -> bool { -fn try_vcpkg() -> bool {
- // see if there is a vcpkg tree with zlib installed - // see if there is a vcpkg tree with zlib installed
@ -195,7 +225,17 @@ index 1368a12..8d1acf7 100644
- .emit_includes(true) - .emit_includes(true)
- .find_package("zlib") - .find_package("zlib")
- { - {
- Ok(_) => true, - Ok(zlib) => {
- if !zlib.include_paths.is_empty() {
- let paths = zlib
- .include_paths
- .iter()
- .map(|s| s.display().to_string())
- .collect::<Vec<_>>();
- println!("cargo:include={}", paths.join(","));
- }
- true
- }
- Err(e) => { - Err(e) => {
- println!("note, vcpkg did not find zlib: {}", e); - println!("note, vcpkg did not find zlib: {}", e);
- false - false
@ -205,7 +245,11 @@ index 1368a12..8d1acf7 100644
- -
-fn zlib_installed(cfg: &mut cc::Build) -> bool { -fn zlib_installed(cfg: &mut cc::Build) -> bool {
- let mut cmd = cfg.get_compiler().to_command(); - let mut cmd = cfg.get_compiler().to_command();
- cmd.arg("src/smoke.c").arg("-o").arg("/dev/null").arg("-lz"); - cmd.arg("src/smoke.c")
- .arg("-g0")
- .arg("-o")
- .arg("/dev/null")
- .arg("-lz");
- -
- println!("running {:?}", cmd); - println!("running {:?}", cmd);
- if let Ok(status) = cmd.status() { - if let Ok(status) = cmd.status() {
@ -216,72 +260,6 @@ index 1368a12..8d1acf7 100644
- -
- false - false
} }
diff --git a/build_zng.rs b/build_zng.rs
deleted file mode 100644
index 2557625..0000000
--- a/build_zng.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use std::env;
-
-pub fn build_zlib_ng(target: &str, compat: bool) {
- let mut cmake = cmake::Config::new("src/zlib-ng");
- cmake
- .define("BUILD_SHARED_LIBS", "OFF")
- .define("ZLIB_COMPAT", if compat { "ON" } else { "OFF" })
- .define("ZLIB_ENABLE_TESTS", "OFF")
- .define("WITH_GZFILEOP", "ON");
- if target.contains("s390x") {
- // Enable hardware compression on s390x.
- cmake
- .define("WITH_DFLTCC_DEFLATE", "1")
- .define("WITH_DFLTCC_INFLATE", "1")
- .cflag("-DDFLTCC_LEVEL_MASK=0x7e");
- }
- if target == "i686-pc-windows-msvc" {
- cmake.define("CMAKE_GENERATOR_PLATFORM", "Win32");
- }
-
- let install_dir = cmake.build();
-
- let includedir = install_dir.join("include");
- let libdir = install_dir.join("lib");
- let libdir64 = install_dir.join("lib64");
- println!(
- "cargo:rustc-link-search=native={}",
- libdir.to_str().unwrap()
- );
- println!(
- "cargo:rustc-link-search=native={}",
- libdir64.to_str().unwrap()
- );
- let mut debug_suffix = "";
- let libname = if target.contains("windows") && target.contains("msvc") {
- if env::var("OPT_LEVEL").unwrap() == "0" {
- debug_suffix = "d";
- }
- "zlibstatic"
- } else {
- "z"
- };
- println!(
- "cargo:rustc-link-lib=static={}{}{}",
- libname,
- if compat { "" } else { "-ng" },
- debug_suffix,
- );
- println!("cargo:root={}", install_dir.to_str().unwrap());
- println!("cargo:include={}", includedir.to_str().unwrap());
- if !compat {
- println!("cargo:rustc-cfg=zng");
- }
-}
-
-#[allow(dead_code)]
-fn main() {
- let target = env::var("TARGET").unwrap();
- build_zlib_ng(&target, false);
-}
-- --
2.43.0 2.46.2

32
SOURCES/libz-sys-fix-metadata.diff
Unescape View File

@ -0,0 +1,32 @@
--- libz-sys-1.1.20/Cargo.toml 1970-01-01T00:00:01+00:00
+++ libz-sys-1.1.20/Cargo.toml 2024-09-25T15:05:48.025207+00:00
@@ -72,29 +72,15 @@
[build-dependencies.cc]
version = "1.0.98"
-[build-dependencies.cmake]
-version = "0.1.50"
-optional = true
-
[build-dependencies.pkg-config]
version = "0.3.9"
-[build-dependencies.vcpkg]
-version = "0.2.11"
-
[features]
-asm = []
default = [
"libc",
"stock-zlib",
]
-static = []
stock-zlib = []
-zlib-ng = [
- "libc",
- "cmake",
-]
-zlib-ng-no-cmake-experimental-community-maintained = ["libc"]
[lints.rust.unexpected_cfgs]
level = "warn"

16
SOURCES/rust2rpm.toml
Unescape View File

@ -0,0 +1,16 @@
[package]
cargo-toml-patch-comments = [
"drop features for zlib-ng support and statically linking libz",
]
[requires]
build = ["pkgconfig(zlib)"]
lib = ["pkgconfig(zlib)"]
[scripts]
prep.post = [
"# remove bundled zlib and zlib-ng sources",
"rm -r src/zlib/",
"rm -r src/zlib-ng/",
]

242
SPECS/rust-libz-sys.spec
Unescape View File

@ -0,0 +1,242 @@
## START: Set by rpmautospec
## (rpmautospec version 0.7.2)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
# Generated by rust2rpm 26
%bcond_without check
%global debug_package %{nil}
%global crate libz-sys
Name: rust-libz-sys
Version: 1.1.20
Release: %autorelease
Summary: Low-level bindings to the system libz library (also known as zlib)
License: MIT OR Apache-2.0
URL: https://crates.io/crates/libz-sys
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# * drop features for zlib-ng support and statically linking libz
Patch: libz-sys-fix-metadata.diff
# * remove code related to building vendored zlib / zlib-ng sources
# * unconditionally use pkg-config to link with system libz
Patch: 0001-unconditionally-use-pkg-config-to-link-with-system-z.patch
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: pkgconfig(zlib)
%global _description %{expand:
Low-level bindings to the system libz library (also known as zlib).}
%description %{_description}
%package devel
Summary: %{summary}
BuildArch: noarch
Requires: pkgconfig(zlib)
%description devel %{_description}
This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE-APACHE
%license %{crate_instdir}/LICENSE-MIT
%doc %{crate_instdir}/README.md
%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+libc-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+libc-devel %{_description}
This package contains library source intended for building other packages which
use the "libc" feature of the "%{crate}" crate.
%files -n %{name}+libc-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+stock-zlib-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+stock-zlib-devel %{_description}
This package contains library source intended for building other packages which
use the "stock-zlib" feature of the "%{crate}" crate.
%files -n %{name}+stock-zlib-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version} -p1
%cargo_prep
# remove bundled zlib and zlib-ng sources
rm -r src/zlib/
rm -r src/zlib-ng/
%generate_buildrequires
%cargo_generate_buildrequires
%build
%cargo_build
%install
%cargo_install
%if %{with check}
%check
%cargo_test
%endif
%changelog
* Fri Dec 20 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.1.20-1
- Rebuilt for MSVSphere 10
## START: Generated by rpmautospec
* Wed Sep 25 2024 Fabio Valentini <decathorpe@gmail.com> - 1.1.20-1
- Update to version 1.1.20; Fixes RHBZ#2283120
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri May 17 2024 Fabio Valentini <decathorpe@gmail.com> - 1.1.16-1
- Update to version 1.1.16; Fixes RHBZ#2260523
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 10 2024 Fabio Valentini <decathorpe@gmail.com> - 1.1.14-1
- Update to version 1.1.14; Fixes RHBZ#2257247
* Sat Jul 29 2023 Fabio Valentini <decathorpe@gmail.com> - 1.1.12-1
- Update to version 1.1.12; Fixes RHBZ#2224862
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon May 01 2023 Fabio Valentini <decathorpe@gmail.com> - 1.1.9-1
- Update to version 1.1.9; Fixes RHBZ#2190481
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon May 30 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.8-1
- Update to version 1.1.8; Fixes RHBZ#2091230
* Thu May 12 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.6-1
- Update to version 1.1.6; Fixes RHBZ#2079190
* Thu Mar 31 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.5-1
- Update to version 1.1.5; Fixes RHBZ#2061218
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 30 2021 Fabio Valentini <decathorpe@gmail.com> - 1.1.3-1
- Update to version 1.1.3.
- Fixes RHBZ#1955368
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Sep 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1.1.2-1
- Update to version 1.1.2.
* Wed Aug 19 2020 Josh Stone <jistone@redhat.com> - 1.1.0-1
- Update to 1.1.0
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 20 12:34:11 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-5
- Regenerate
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-3
- Run tests in infrastructure
* Sun Nov 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-2
- Adapt to new packaging
* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.0.25-1
- Update to 1.0.25
* Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.0.24-1
- Update to 1.0.24
* Fri Sep 28 2018 Josh Stone <jistone@redhat.com> - 1.0.23-1
- Update to 1.0.23
* Mon Sep 17 2018 Josh Stone <jistone@redhat.com> - 1.0.22-1
- Update to 1.0.22
* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.0.20-1
- Update to 1.0.20
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-3
- Rebuild for rust-packaging v5
* Sun Dec 03 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-2
- Remove bundled zlib
* Thu Nov 16 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-1
- Update to 1.0.18
* Mon Jun 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.16-1
- Update to 1.0.16
* Thu Jun 15 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.14-1
- Update to 1.0.14
* Wed Jun 14 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-3
- Port to use rust-packaging
* Sun Feb 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-2
- Rebuild
* Sun Feb 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-1
- Initial package
## END: Generated by rpmautospec

84
changelog
Unescape View File

@ -1,84 +0,0 @@
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 30 2021 Fabio Valentini <decathorpe@gmail.com> - 1.1.3-1
- Update to version 1.1.3.
- Fixes RHBZ#1955368
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Sep 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1.1.2-1
- Update to version 1.1.2.
* Wed Aug 19 2020 Josh Stone <jistone@redhat.com> - 1.1.0-1
- Update to 1.1.0
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 20 12:34:11 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-5
- Regenerate
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 20 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-3
- Run tests in infrastructure
* Sun Nov 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.25-2
- Adapt to new packaging
* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.0.25-1
- Update to 1.0.25
* Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.0.24-1
- Update to 1.0.24
* Fri Sep 28 2018 Josh Stone <jistone@redhat.com> - 1.0.23-1
- Update to 1.0.23
* Mon Sep 17 2018 Josh Stone <jistone@redhat.com> - 1.0.22-1
- Update to 1.0.22
* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.0.20-1
- Update to 1.0.20
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-3
- Rebuild for rust-packaging v5
* Sun Dec 03 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-2
- Remove bundled zlib
* Thu Nov 16 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.18-1
- Update to 1.0.18
* Mon Jun 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.16-1
- Update to 1.0.16
* Thu Jun 15 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.14-1
- Update to 1.0.14
* Wed Jun 14 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-3
- Port to use rust-packaging
* Sun Feb 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-2
- Rebuild
* Sun Feb 26 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.13-1
- Initial package

28
libz-sys-fix-metadata.diff
Unescape View File

@ -1,28 +0,0 @@
--- libz-sys-1.1.14/Cargo.toml 1970-01-01T00:00:01+00:00
+++ libz-sys-1.1.14/Cargo.toml 2024-01-10T16:05:38.163257+00:00
@@ -47,25 +47,12 @@
[build-dependencies.cc]
version = "1.0.18"
-[build-dependencies.cmake]
-version = "0.1.44"
-optional = true
-
[build-dependencies.pkg-config]
version = "0.3.9"
-[build-dependencies.vcpkg]
-version = "0.2"
-
[features]
-asm = []
default = [
"libc",
"stock-zlib",
]
-static = []
stock-zlib = []
-zlib-ng = [
- "libc",
- "cmake",
-]

104
rust-libz-sys.spec
Unescape View File

@ -1,104 +0,0 @@
# Generated by rust2rpm 25
%bcond_without check
%global debug_package %{nil}
%global crate libz-sys
Name: rust-libz-sys
Version: 1.1.14
Release: %autorelease
Summary: Low-level bindings to the system libz library (also known as zlib)
License: MIT OR Apache-2.0
URL: https://crates.io/crates/libz-sys
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# * drop features for zlib-ng, static linking, and unavailalbe asm optimizations
Patch: libz-sys-fix-metadata.diff
# * remove code related to building vendored zlib / zlib-ng sources
# * unconditionally use pkg-config to link with system libz
Patch: 0001-unconditionally-use-pkg-config-to-link-with-system-z.patch
BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
Low-level bindings to the system libz library (also known as zlib).}
%description %{_description}
%package devel
Summary: %{summary}
BuildArch: noarch
Requires: pkgconfig(zlib)
%description devel %{_description}
This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE-APACHE
%license %{crate_instdir}/LICENSE-MIT
%doc %{crate_instdir}/README.md
%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+libc-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+libc-devel %{_description}
This package contains library source intended for building other packages which
use the "libc" feature of the "%{crate}" crate.
%files -n %{name}+libc-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+stock-zlib-devel
Summary: %{summary}
BuildArch: noarch
%description -n %{name}+stock-zlib-devel %{_description}
This package contains library source intended for building other packages which
use the "stock-zlib" feature of the "%{crate}" crate.
%files -n %{name}+stock-zlib-devel
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version} -p1
%cargo_prep
# remove bundled zlib and zlib-ng sources
rm -r src/zlib/
rm -r src/zlib-ng/
%generate_buildrequires
%cargo_generate_buildrequires
echo 'pkgconfig(zlib)'
%build
%cargo_build
%install
%cargo_install
%if %{with check}
%check
%cargo_test
%endif
%changelog
%autochangelog

4
rust2rpm.toml
Unescape View File

@ -1,4 +0,0 @@
[requires]
build = ["pkgconfig(zlib)"]
lib = ["pkgconfig(zlib)"]

1
sources
Unescape View File

@ -1 +0,0 @@
SHA512 (libz-sys-1.1.14.crate) = f02dd44bced6d97a226a51b9bfc85a9b5757cb16f414578dac9889aac8fe2fa1e1a53bc1de6991a0693f183518b53972f4b8d4a42117bab67325ada51b853d6d
Write Preview
Loading…
Cancel
Save