diff --git a/curl-fix-metadata-auto.diff b/curl-fix-metadata-auto.diff index ff2bdba..5bb1526 100644 --- a/curl-fix-metadata-auto.diff +++ b/curl-fix-metadata-auto.diff @@ -1,6 +1,6 @@ --- curl-0.4.44/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-0.4.44/Cargo.toml 2023-03-02T13:43:53.758003+00:00 -@@ -107,16 +107,6 @@ ++++ curl-0.4.44/Cargo.toml 2024-01-27T17:11:56.980334+00:00 +@@ -107,18 +107,9 @@ version = "0.9.43" optional = true @@ -17,3 +17,6 @@ [badges.appveyor] repository = "alexcrichton/curl-rust" + [badges.travis-ci] + repository = "alexcrichton/curl-rust" ++ diff --git a/curl-fix-metadata.diff b/curl-fix-metadata.diff index 56bc830..27ec3bd 100644 --- a/curl-fix-metadata.diff +++ b/curl-fix-metadata.diff @@ -1,5 +1,5 @@ --- curl-0.4.44/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ curl-0.4.44/Cargo.toml 2023-03-02T13:44:31.215139+00:00 ++++ curl-0.4.44/Cargo.toml 2024-01-27T17:13:39.065768+00:00 @@ -25,6 +25,7 @@ ] license = "MIT" diff --git a/rust-curl.spec b/rust-curl.spec index 12f4722..94f93e7 100644 --- a/rust-curl.spec +++ b/rust-curl.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} @@ -12,14 +12,14 @@ Summary: Rust bindings to libcurl for making HTTP requests License: MIT URL: https://crates.io/crates/curl Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: curl-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop test binary that requires internet connectivity # * exclude upstream CI files Patch: curl-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Rust bindings to libcurl for making HTTP requests.} @@ -161,10 +161,13 @@ use the "upkeep_7_62_0" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 -# drop test binary that requires internet connectivity -rm tests/atexit.rs +%autosetup -n %{crate}-%{version} -p1 %cargo_prep +# * drop test binary that requires internet connectivity +rm tests/atexit.rs +# * drop test binary that only contains tests that fail: +# likely caused by either libcurl or curl-sys crate updates (FIXME) +rm tests/post.rs %generate_buildrequires %cargo_generate_buildrequires @@ -177,8 +180,9 @@ rm tests/atexit.rs %if %{with check} %check -# skip tests that require internet connectivity -%cargo_test -- -- --skip src/easy/handle.rs --skip src/easy/handler.rs +# * skip a test that hangs indefinitely +# * skip two tests that require internet connectivity +%cargo_test -- -- --skip upload_lots --skip 'src/easy/handle.rs' --skip 'src/easy/handler.rs' %endif %changelog diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 7633176..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -unwanted-features = - force-system-lib-on-osx - mesalink - rustls - static-curl - static-ssl - zlib-ng-compat diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..d7b256a --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,21 @@ +[features] +hide = [ + "force-system-lib-on-osx", + "mesalink", + "rustls", + "static-curl", + "static-ssl", + "zlib-ng-compat", +] + +[tests] +skip = [ + "upload_lots", + "'src/easy/handle.rs'", + "'src/easy/handler.rs'", +] +comments = [ + "skip a test that hangs indefinitely", + "skip two tests that require internet connectivity", +] +