diff --git a/.gitignore b/.gitignore index 72d3cde..d1118b2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /curl-0.4.20.crate /curl-0.4.22.crate /curl-0.4.25.crate +/curl-0.4.26.crate diff --git a/curl-fix-metadata.diff b/curl-fix-metadata.diff index 615498f..ca240ba 100644 --- a/curl-fix-metadata.diff +++ b/curl-fix-metadata.diff @@ -1,25 +1,27 @@ ---- curl-0.4.25/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ curl-0.4.25/Cargo.toml 2019-11-23T00:18:29.474934+00:00 -@@ -42,12 +42,8 @@ +--- curl-0.4.26/Cargo.toml 2020-02-28T16:20:29+00:00 ++++ curl-0.4.26/Cargo.toml 2020-03-02T22:10:08.579916+00:00 +@@ -42,14 +42,10 @@ [features] default = ["ssl"] -force-system-lib-on-osx = ["curl-sys/force-system-lib-on-osx"] http2 = ["curl-sys/http2"] -mesalink = ["curl-sys/mesalink"] + protocol-ftp = ["curl-sys/protocol-ftp"] + spnego = ["curl-sys/spnego"] ssl = ["openssl-sys", "openssl-probe", "curl-sys/ssl"] -static-curl = ["curl-sys/static-curl"] -static-ssl = ["curl-sys/static-ssl"] [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe] version = "0.1.2" optional = true -@@ -55,12 +51,7 @@ +@@ -57,12 +53,6 @@ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys] version = "0.9.43" optional = true -[target."cfg(target_env = \"msvc\")".dependencies.schannel] -version = "0.1.13" - +- -[target."cfg(target_env = \"msvc\")".dependencies.winapi] -version = "0.3" -features = ["libloaderapi", "wincrypt"] diff --git a/rust-curl.spec b/rust-curl.spec index 7eeaddc..29b98fd 100644 --- a/rust-curl.spec +++ b/rust-curl.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 # Tests are run in infrastructure %bcond_with check %global debug_package %{nil} @@ -6,8 +6,8 @@ %global crate curl Name: rust-%{crate} -Version: 0.4.25 -Release: 2%{?dist} +Version: 0.4.26 +Release: 1%{?dist} Summary: Rust bindings to libcurl for making HTTP requests # Upstream license specification: MIT @@ -43,8 +43,8 @@ which use "%{crate}" crate. %files devel %license LICENSE %doc README.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,ci} +%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/{appveyor.yml,ci} %package -n %{name}+default-devel Summary: %{summary} @@ -56,7 +56,7 @@ 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 +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+http2-devel Summary: %{summary} @@ -68,7 +68,7 @@ This package contains library source intended for building other packages which use "http2" feature of "%{crate}" crate. %files -n %{name}+http2-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+openssl-probe-devel Summary: %{summary} @@ -80,7 +80,7 @@ This package contains library source intended for building other packages which use "openssl-probe" feature of "%{crate}" crate. %files -n %{name}+openssl-probe-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+openssl-sys-devel Summary: %{summary} @@ -92,7 +92,31 @@ 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 +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+protocol-ftp-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+protocol-ftp-devel %{_description} + +This package contains library source intended for building other packages +which use "protocol-ftp" feature of "%{crate}" crate. + +%files -n %{name}+protocol-ftp-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+spnego-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+spnego-devel %{_description} + +This package contains library source intended for building other packages +which use "spnego" feature of "%{crate}" crate. + +%files -n %{name}+spnego-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+ssl-devel Summary: %{summary} @@ -104,7 +128,7 @@ 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 +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -125,6 +149,9 @@ which use "ssl" feature of "%{crate}" crate. %endif %changelog +* Mon Mar 02 2020 Josh Stone - 0.4.26-1 +- Update to 0.4.26 + * Thu Jan 30 2020 Fedora Release Engineering - 0.4.25-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index a2894e1..7f659ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-0.4.25.crate) = c42efa6bcb5989c4f3a91629d0a547448ccce7fc8556b802ed2bdd10941cae25bb1ad15cd914024f1fdb0d1799ac2345fdc649b985b86eb87074b2b80e7c80d3 +SHA512 (curl-0.4.26.crate) = edf82bae7cd3c3dc40942073ebabca954c6a6ced08bc66d5b38aea10a7b7e284af3ccfb37b20462ef4b8eba9e6ff1de48e7df8f07e052711379b26418980f6ad