From 7479255b85e060f9a4b862326968245ffc0d93f1 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 21 Dec 2023 21:41:13 +0100 Subject: [PATCH] Update to version 0.3.28; Fixes RHBZ#2255417 --- .gitignore | 1 + rust-pkg-config.spec | 11 +++++------ rust2rpm.conf | 5 ----- rust2rpm.toml | 7 +++++++ sources | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 rust2rpm.conf create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 7447f8c..2ad43b4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /pkg-config-0.3.25.crate /pkg-config-0.3.26.crate /pkg-config-0.3.27.crate +/pkg-config-0.3.28.crate diff --git a/rust-pkg-config.spec b/rust-pkg-config.spec index 7fc68d5..3281ada 100644 --- a/rust-pkg-config.spec +++ b/rust-pkg-config.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate pkg-config Name: rust-pkg-config -Version: 0.3.27 +Version: 0.3.28 Release: %autorelease Summary: Library to run the pkg-config system tool @@ -13,7 +13,7 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/pkg-config Source: %{crates_source} -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A library to run the pkg-config system tool at build time in order to be @@ -51,7 +51,7 @@ use the "default" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -66,8 +66,7 @@ echo '/usr/bin/pkg-config' %if %{with check} %check -# * skip a test that fails with latest versions of pkgconf -%cargo_test -- -- --exact --skip escapes +%cargo_test %endif %changelog diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 00b10ad..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -buildrequires = - /usr/bin/pkg-config -lib.requires = - /usr/bin/pkg-config diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..2faf459 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,7 @@ +[package] +summary = "Library to run the pkg-config system tool" + +[requires] +build = ["/usr/bin/pkg-config"] +lib = ["/usr/bin/pkg-config"] + diff --git a/sources b/sources index f805a36..5e5dc63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkg-config-0.3.27.crate) = 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +SHA512 (pkg-config-0.3.28.crate) = 1ef92c5cf5320fb2e7d9e337edae08eaef01c762cb18406f732af731e5a94bef95be36cc0e0f5643f47a925aa127c5520a961c034e7b86357715656707a6e0e4