From 71d012911744d8e28c471df4e1fc3fd5a3f8f79b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:48:18 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index f391ace..9ec1208 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -27,7 +27,7 @@ Name: pkgconf Version: 1.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.9.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 39756f15ceb0bdd2f79f0976ed169f4828c809f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:35:25 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 9ec1208..733d3c7 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -27,7 +27,7 @@ Name: pkgconf Version: 1.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.9.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.9.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 95c0bbee8010a6039e649262cfd5cc1eeba7e3f0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 12 Feb 2024 23:27:27 +0800 Subject: [PATCH 03/10] update to 2.1.0 --- .gitignore | 1 + pkgconf.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9a189b3..1242c51 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /pkgconf-1.8.0.tar.xz /pkgconf-1.9.4.tar.xz /pkgconf-1.9.5.tar.xz +/pkgconf-2.1.0.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 733d3c7..5ae429b 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -26,13 +26,12 @@ %global libsomajor 4 Name: pkgconf -Version: 1.9.5 -Release: 4%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC URL: http://pkgconf.org/ -# Mirror at https://releases.pagure.org/pkgconf/pkgconf/ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz # Simple wrapper scripts to offer platform versions of pkgconfig @@ -226,6 +225,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Mon Feb 12 2024 Jens Petersen - 2.1.0-1 +- update to 2.1.0 +- https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.0/NEWS + * Thu Jan 25 2024 Fedora Release Engineering - 1.9.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 1f47994..77faef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.9.5.tar.xz) = 604853d8bb1c3ca14e696f83ac5b161e2592defb921d53e1c16cc949d4b9ecac2b12983c1fbbb3c89898323bda18c8749bff3946e049c8305a1a39a773265f09 +SHA512 (pkgconf-2.1.0.tar.xz) = 239dd75814d23f98a64c7df7ab12bc87a0ba52227ef0102086876e39712a2a5d2fdd1e27314070f66f9b38ef5bc0a31f0b90522f34bf8351e7bfb12c75313641 From 924aee55e1a5bb9723892712e3274c0fc815d8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 6 Feb 2024 04:36:26 +0000 Subject: [PATCH 04/10] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_3 --- pkgconf.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgconf.spec b/pkgconf.spec index 5ae429b..44bbc24 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -30,7 +30,12 @@ Version: 2.1.0 Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit -License: ISC +# cli/getopt_long.c, libpkgconf/bsdstubs.c, libpkgconf/pkg.c and tests/* are ISC +# cli/getopt_long.c is BSD-4-Clause +# cli/getopt_long.h is BSD-2-Clause +# bunch of files are under pkgconf +# libpkgconf/win-dirent.h is MIT +License: ISC AND BSD-4-Clause AND BSD-2-Clause AND pkgconf AND MIT URL: http://pkgconf.org/ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz @@ -81,7 +86,7 @@ to use functionality provided by %{name}. %if %{with pkgconfig_compat} %package m4 Summary: m4 macros for pkgconf -License: GPLv2+ with exceptions +License: GPL-2.0-or-later WITH Autoconf-exception-generic BuildArch: noarch # Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it Conflicts: pkgconfig < %{pkgconfig_evr} From 5559cbe1640febc490f57d4c1f831b36a3da7d01 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 14 May 2024 18:10:33 +0800 Subject: [PATCH 05/10] update to 2.1.1 release (fixes rhbz#2264921) --- .gitignore | 1 + pkgconf.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1242c51..eb0e030 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /pkgconf-1.9.4.tar.xz /pkgconf-1.9.5.tar.xz /pkgconf-2.1.0.tar.xz +/pkgconf-2.1.1.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 44bbc24..40eec74 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -26,7 +26,7 @@ %global libsomajor 4 Name: pkgconf -Version: 2.1.0 +Version: 2.1.1 Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit @@ -230,6 +230,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Tue May 14 2024 Jens Petersen - 2.1.1-1 +- https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.1/NEWS + * Mon Feb 12 2024 Jens Petersen - 2.1.0-1 - update to 2.1.0 - https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.0/NEWS diff --git a/sources b/sources index 77faef8..9742755 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-2.1.0.tar.xz) = 239dd75814d23f98a64c7df7ab12bc87a0ba52227ef0102086876e39712a2a5d2fdd1e27314070f66f9b38ef5bc0a31f0b90522f34bf8351e7bfb12c75313641 +SHA512 (pkgconf-2.1.1.tar.xz) = cdf0998cd87f6d5e5a6560037eb847fd9613d237858d26eec321c42f54ca40ac72b6749c48c5b32611841d701393b1217bdb6c0cba5efd2c138be10d0e8fb32d From 47ebf369ccebacbcfe0903884b74b68770a71a32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:52:58 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 40eec74..79c5281 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -27,7 +27,7 @@ Name: pkgconf Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit # cli/getopt_long.c, libpkgconf/bsdstubs.c, libpkgconf/pkg.c and tests/* are ISC @@ -230,6 +230,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 14 2024 Jens Petersen - 2.1.1-1 - https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.1/NEWS From 375c464fcc669b602dee04a27e9f372ba15c3e6e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 7 Aug 2024 04:19:21 -0400 Subject: [PATCH 07/10] Update to 2.3.0 - https://github.com/pkgconf/pkgconf/blob/pkgconf-2.3.0/NEWS --- .gitignore | 1 + pkgconf.spec | 24 ++++++++++-------------- sources | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index eb0e030..a2a6059 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /pkgconf-1.9.5.tar.xz /pkgconf-2.1.0.tar.xz /pkgconf-2.1.1.tar.xz +/pkgconf-2.3.0.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 79c5281..ca75d80 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -1,9 +1,5 @@ -# pkgconf acts as pkgconfig for Fedora and EL8+ -%if (0%{?rhel} && 0%{?rhel} <= 7) -%bcond_with pkgconfig_compat -%else -%bcond_without pkgconfig_compat -%endif +# pkgconf acts as pkgconfig +%bcond pkgconfig_compat 1 %if %{with pkgconfig_compat} %global pkgconfig_ver 0.29.1 @@ -13,21 +9,17 @@ %endif # Tests are disabled on RHEL 9 because of the extensive dependencies -%if 0%{?rhel} >= 9 -%bcond_with tests -%else -%bcond_without tests -%endif +%bcond tests %[%{undefined rhel} || 0%{?rhel} < 9] # Search path for pc files for pkgconf %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig # libpkgconf soversion major version -%global libsomajor 4 +%global libsomajor 5 Name: pkgconf -Version: 2.1.1 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit # cli/getopt_long.c, libpkgconf/bsdstubs.c, libpkgconf/pkg.c and tests/* are ISC @@ -230,6 +222,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Wed Aug 07 2024 Neal Gompa - 2.3.0-1 +- Update to 2.3.0 + + https://github.com/pkgconf/pkgconf/blob/pkgconf-2.3.0/NEWS + * Fri Jul 19 2024 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 9742755..ede70b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-2.1.1.tar.xz) = cdf0998cd87f6d5e5a6560037eb847fd9613d237858d26eec321c42f54ca40ac72b6749c48c5b32611841d701393b1217bdb6c0cba5efd2c138be10d0e8fb32d +SHA512 (pkgconf-2.3.0.tar.xz) = 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c From c8bdd675b70088f13c4ccb706192d0ac5e8e1735 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 5 Aug 2024 14:59:14 -0400 Subject: [PATCH 08/10] Search /app in flatpak runtime build While flatpak-rpm-macros uses PKG_CONFIG_PATH to allow the regular pkg-config build find flatpak-built content in /app during %build, %install, and %check, this does not help for pkg-config calls in the global scope. Rather than change each call to first load the environment overrides, this will allow a flatpak runtime specific build which will search both /app and /usr by default. https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/G2WPISQFQEVJY6ZRJDVUVZIUEQD3L4YZ/ --- pkgconf.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgconf.spec b/pkgconf.spec index ca75d80..03a2378 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -12,7 +12,11 @@ %bcond tests %[%{undefined rhel} || 0%{?rhel} < 9] # Search path for pc files for pkgconf +%if 0%{?flatpak_runtime} +%global pkgconf_libdirs /app/%{_lib}/pkgconfig:/app/share/pkgconfig:/usr/%{_lib}/pkgconfig:/usr/share/pkgconfig +%else %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig +%endif # libpkgconf soversion major version %global libsomajor 5 From c9f01eb77bd52bbce28e1aa9157dd36dd869519e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 08:24:07 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 03a2378..8d3dbd1 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -23,7 +23,7 @@ Name: pkgconf Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit # cli/getopt_long.c, libpkgconf/bsdstubs.c, libpkgconf/pkg.c and tests/* are ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Neal Gompa - 2.3.0-1 - Update to 2.3.0 + https://github.com/pkgconf/pkgconf/blob/pkgconf-2.3.0/NEWS From a6c50c2405b2b6f9725d5ed77325ddf8181e5adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:48:24 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 8d3dbd1..d837cf3 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -23,7 +23,7 @@ Name: pkgconf Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit # cli/getopt_long.c, libpkgconf/bsdstubs.c, libpkgconf/pkg.c and tests/* are ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jan 20 2025 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild