diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..c2ea5c0 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,5 @@ +[DEFAULT] +buildrequires = + pkgconfig(zlib) +lib.requires = + pkgconfig(zlib) diff --git a/libz-sys-fix-metadata.diff b/libz-sys-fix-metadata.diff index 6d2ba73..2240126 100644 --- a/libz-sys-fix-metadata.diff +++ b/libz-sys-fix-metadata.diff @@ -1,5 +1,5 @@ ---- libz-sys-1.0.25/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ libz-sys-1.0.25/Cargo.toml 2018-10-26T10:33:26.749891-07:00 +--- libz-sys-1.0.25/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ libz-sys-1.0.25/Cargo.toml 2018-11-04T17:39:46.882431+01:00 @@ -28,9 +28,3 @@ [build-dependencies.pkg-config] diff --git a/rust-libz-sys.spec b/rust-libz-sys.spec index 55fd6af..e63df0f 100644 --- a/rust-libz-sys.spec +++ b/rust-libz-sys.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 1.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bindings to the system libz library (also known as zlib) # Upstream license specification: MIT/Apache-2.0 @@ -21,26 +21,42 @@ Patch0: libz-sys-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(libc) >= 0.2.43 with crate(libc) < 0.3.0) -# [build-dependencies] -BuildRequires: (crate(cc) >= 1.0.18 with crate(cc) < 2.0.0) -BuildRequires: (crate(pkg-config) >= 0.3.9 with crate(pkg-config) < 0.4.0) +BuildRequires: (crate(cc/default) >= 1.0.18 with crate(cc/default) < 2.0.0) +BuildRequires: (crate(libc/default) >= 0.2.43 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(pkg-config/default) >= 0.3.9 with crate(pkg-config/default) < 0.4.0) BuildRequires: pkgconfig(zlib) -%description -%{summary}. +%global _description \ +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 "%{crate}" crate. + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%doc README.md +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} BuildArch: noarch -%description devel -Bindings to the system libz library (also known as zlib). +%description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -59,13 +75,10 @@ rm -vrf src/zlib/ %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml - %changelog +* Sun Nov 04 2018 Igor Gnatenko - 1.0.25-2 +- Adapt to new packaging + * Thu Oct 25 2018 Josh Stone - 1.0.25-1 - Update to 1.0.25