diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index 0b237d4..dbe9d46 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,5 +1,5 @@ ---- curl-sys-0.4.13/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ curl-sys-0.4.13/Cargo.toml 2018-10-08T16:16:36.327892-07:00 +--- curl-sys-0.4.13/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ curl-sys-0.4.13/Cargo.toml 2018-11-04T17:46:17.694802+01:00 @@ -28,10 +28,6 @@ [dependencies.libc] version = "0.2.2" diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index 02662f0..776155f 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 0.4.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Native bindings to the libcurl library License: MIT @@ -22,28 +22,79 @@ Patch1: curl-sys-remove-libnghttp2-sys.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(libc) >= 0.2.2 with crate(libc) < 0.3.0) -BuildRequires: (crate(libz-sys) >= 1.0.18 with crate(libz-sys) < 2.0.0) -BuildRequires: (crate(openssl-sys) >= 0.9.0 with crate(openssl-sys) < 0.10.0) -# [build-dependencies] -BuildRequires: (crate(cc) >= 1.0.0 with crate(cc) < 2.0.0) -BuildRequires: (crate(pkg-config) >= 0.3.3 with crate(pkg-config) < 0.4.0) +BuildRequires: (crate(cc/default) >= 1.0.0 with crate(cc/default) < 2.0.0) +BuildRequires: (crate(libc/default) >= 0.2.2 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(libz-sys/default) >= 1.0.18 with crate(libz-sys/default) < 2.0.0) +BuildRequires: (crate(openssl-sys/default) >= 0.9.0 with crate(openssl-sys/default) < 0.10.0) +BuildRequires: (crate(pkg-config/default) >= 0.3.3 with crate(pkg-config/default) < 0.4.0) BuildRequires: pkgconfig(libcurl) -%description -%{summary}. +%global _description \ +Native bindings to the libcurl library. + +%description %{_description} %package devel Summary: %{summary} +BuildArch: noarch Requires: pkgconfig(libcurl) + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} BuildArch: noarch -%description devel -Native bindings to the libcurl library. +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+http2-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http2-devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "http2" feature of "%{crate}" crate. + +%files -n %{name}+http2-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+openssl-sys-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+openssl-sys-devel %{_description} + +This package contains library source intended for building other packages +which use "openssl-sys" feature of "%{crate}" crate. + +%files -n %{name}+openssl-sys-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+ssl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+ssl-devel %{_description} + +This package contains library source intended for building other packages +which use "ssl" feature of "%{crate}" crate. + +%files -n %{name}+ssl-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -62,11 +113,10 @@ rm -vrf curl %cargo_test %endif -%files devel -%license LICENSE -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sun Nov 04 2018 Igor Gnatenko - 0.4.13-2 +- Adapt to new packaging + * Mon Oct 08 2018 Josh Stone - 0.4.13-1 - Update to 0.4.13