diff --git a/.gitignore b/.gitignore index b74bc07..630d094 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /git2-curl-0.13.0.crate /git2-curl-0.14.0.crate /git2-curl-0.14.1.crate +/git2-curl-0.15.0.crate diff --git a/git2-curl-fix-metadata.diff b/git2-curl-fix-metadata.diff index 20d6551..b2c5634 100644 --- a/git2-curl-fix-metadata.diff +++ b/git2-curl-fix-metadata.diff @@ -1,6 +1,6 @@ ---- git2-curl-0.14.1/Cargo.toml 2020-08-19T20:17:52+00:00 -+++ git2-curl-0.14.1/Cargo.toml 2020-08-20T00:06:28.079581+00:00 -@@ -46,6 +46,3 @@ +--- git2-curl-0.15.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ git2-curl-0.15.0/Cargo.toml 2022-08-25T10:35:12.972414+00:00 +@@ -45,6 +45,3 @@ [dev-dependencies.tempfile] version = "3.0" diff --git a/rust-git2-curl.spec b/rust-git2-curl.spec index 1253309..dad4c72 100644 --- a/rust-git2-curl.spec +++ b/rust-git2-curl.spec @@ -1,29 +1,26 @@ -# Generated by rust2rpm 13 -# We don't want to package conduit +# Generated by rust2rpm 22 +# * missing dev-dependencies: civet, conduit, conduit-git-http-backend %bcond_with check %global debug_package %{nil} %global crate git2-curl -Name: rust-%{crate} -Version: 0.14.1 +Name: rust-git2-curl +Version: 0.15.0 Release: %autorelease Summary: Backend for an HTTP transport in libgit2 powered by libcurl # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/git2-curl Source: %{crates_source} -# Initial patched metadata -# * No zlib-ng feature -Patch0: git2-curl-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * drop features and dependencies for the unused zlib-ng support +Patch: git2-curl-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Backend for an HTTP transport in libgit2 powered by libcurl. @@ -37,12 +34,13 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-MIT LICENSE-APACHE -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,11 +48,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 91cab42..95fb1c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (git2-curl-0.14.1.crate) = bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c +SHA512 (git2-curl-0.15.0.crate) = f28249071661689e57b852a8edaff6a1d2f5dddc6c6c84ac83fd3c270235eb1551f74fdfe43e32ff753a39f53981bf438760ebaf04ab698a9e313d1f4652c021