diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..5635183 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,5 @@ +[DEFAULT] +buildrequires = + (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) +lib.requires = + (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec index b3a918e..f00cdd4 100644 --- a/rust-libgit2-sys.spec +++ b/rust-libgit2-sys.spec @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 0.7.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Native bindings to the libgit2 library # Upstream license specification: MIT/Apache-2.0 @@ -24,30 +24,129 @@ Patch1: rust-libgit2-sys-no-include_depth.patch ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(curl-sys) >= 0.4.10 with crate(curl-sys) < 0.5.0) -BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) -BuildRequires: (crate(libssh2-sys) >= 0.2.11 with crate(libssh2-sys) < 0.3.0) -BuildRequires: (crate(libz-sys) >= 1.0.22 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.25 with crate(cc) < 2.0.0) -BuildRequires: (crate(pkg-config) >= 0.3.0 with crate(pkg-config) < 0.4.0) +BuildRequires: (crate(cc/default) >= 1.0.25 with crate(cc/default) < 2.0.0) +BuildRequires: (crate(curl-sys/default) >= 0.4.10 with crate(curl-sys/default) < 0.5.0) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(libssh2-sys/default) >= 0.2.11 with crate(libssh2-sys/default) < 0.3.0) +BuildRequires: (crate(libz-sys/default) >= 1.0.22 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.0 with crate(pkg-config/default) < 0.4.0) BuildRequires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) -%description -%{summary}. +%global _description \ +Native bindings to the libgit2 library. + +%description %{_description} %package devel Summary: %{summary} +BuildArch: noarch Requires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28) + +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} BuildArch: noarch -%description devel -Native bindings to the libgit2 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}+curl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+curl-devel %{_description} + +This package contains library source intended for building other packages +which use "curl" feature of "%{crate}" crate. + +%files -n %{name}+curl-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+curl-sys-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+curl-sys-devel %{_description} + +This package contains library source intended for building other packages +which use "curl-sys" feature of "%{crate}" crate. + +%files -n %{name}+curl-sys-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+https-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+https-devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "https" feature of "%{crate}" crate. + +%files -n %{name}+https-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+libssh2-sys-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+libssh2-sys-devel %{_description} + +This package contains library source intended for building other packages +which use "libssh2-sys" feature of "%{crate}" crate. + +%files -n %{name}+libssh2-sys-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}+ssh-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+ssh-devel %{_description} + +This package contains library source intended for building other packages +which use "ssh" feature of "%{crate}" crate. + +%files -n %{name}+ssh-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+ssh_key_from_memory-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+ssh_key_from_memory-devel %{_description} + +This package contains library source intended for building other packages +which use "ssh_key_from_memory" feature of "%{crate}" crate. + +%files -n %{name}+ssh_key_from_memory-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -N @@ -67,11 +166,10 @@ rm -vrf libgit2 %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sun Nov 04 2018 Igor Gnatenko - 0.7.10-2 +- Adapt to new packaging + * Fri Sep 28 2018 Josh Stone - 0.7.10-1 - Update to 0.7.10