From 5a255d5ec295bd694ed4a2bacd7c739cd5516d8c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 27 Jun 2018 21:03:18 -0400 Subject: [PATCH 01/48] Upgrade to 1.5.1 --- .gitignore | 1 + pkgconf.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c4a6151..7a86311 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /pkgconf-1.4.0.tar.xz /pkgconf-1.4.1.tar.xz /pkgconf-1.4.2.tar.xz +/pkgconf-1.5.1.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 0eeb136..3e2022c 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,7 +16,7 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.4.2 +Version: 1.5.1 Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit @@ -179,6 +179,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Wed Jun 27 2018 Neal Gompa - 1.5.1-1 +- Upgrade to 1.5.1 + * Sat Mar 31 2018 Neal Gompa - 1.4.2-1 - Update to 1.4.2 - Drop conditionals for old Fedora releases diff --git a/sources b/sources index 36abec9..83afe72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.4.2.tar.xz) = d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236 +SHA512 (pkgconf-1.5.1.tar.xz) = a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a From dfb5062322967f1e12fb0ec38272616f91e12d38 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 29 Jun 2018 13:37:22 -0400 Subject: [PATCH 02/48] Add patch to fix system path override issue --- ...vironment-variables-for-system-paths.patch | 38 +++++++++++++++++++ pkgconf.spec | 8 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-environment-variables-for-system-paths.patch diff --git a/0001-environment-variables-for-system-paths.patch b/0001-environment-variables-for-system-paths.patch new file mode 100644 index 0000000..b98cc16 --- /dev/null +++ b/0001-environment-variables-for-system-paths.patch @@ -0,0 +1,38 @@ +From fb08ae2bd21c0f25d719d1914a07f19cef1a3619 Mon Sep 17 00:00:00 2001 +From: Graham Ollis +Date: Mon, 25 Jun 2018 06:36:57 -0400 +Subject: [PATCH] environment variables for system paths should override + compiled-in defaults + +--- + libpkgconf/client.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/libpkgconf/client.c b/libpkgconf/client.c +index 796014d..f4155b3 100644 +--- a/libpkgconf/client.c ++++ b/libpkgconf/client.c +@@ -96,11 +96,15 @@ pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error + pkgconf_client_set_buildroot_dir(client, NULL); + pkgconf_client_set_prefix_varname(client, NULL); + +- pkgconf_path_copy_list(&client->filter_libdirs, &personality->filter_libdirs); +- pkgconf_path_copy_list(&client->filter_includedirs, &personality->filter_includedirs); +- +- pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", NULL, &client->filter_libdirs, false); +- pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", NULL, &client->filter_includedirs, false); ++ if(getenv("PKG_CONFIG_SYSTEM_LIBRARY_PATH") == NULL) ++ pkgconf_path_copy_list(&client->filter_libdirs, &personality->filter_libdirs); ++ else ++ pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", NULL, &client->filter_libdirs, false); ++ ++ if(getenv("PKG_CONFIG_SYSTEM_INCLUDE_PATH") == NULL) ++ pkgconf_path_copy_list(&client->filter_includedirs, &personality->filter_includedirs); ++ else ++ pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", NULL, &client->filter_includedirs, false); + + /* GCC uses these environment variables to define system include paths, so we should check them. */ + #ifdef __HAIKU__ +-- +2.17.1 + diff --git a/pkgconf.spec b/pkgconf.spec index 3e2022c..011759d 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -27,6 +27,9 @@ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.ta # Simple wrapper script to offer platform versions of pkgconfig Source1: platform-pkg-config.in +# From: https://git.dereferenced.org/pkgconf/pkgconf/pulls/1 +Patch0001: 0001-environment-variables-for-system-paths.patch + BuildRequires: gcc BuildRequires: make @@ -179,6 +182,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jun 29 2018 Neal Gompa - 1.5.1-2 +- Add patch to fix system path override issue + * Wed Jun 27 2018 Neal Gompa - 1.5.1-1 - Upgrade to 1.5.1 From 3cc928cc3f1452080ce174cfa0c52e9724986702 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 22:30:28 +0000 Subject: [PATCH 03/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 011759d..3184c33 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -182,6 +182,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Neal Gompa - 1.5.1-2 - Add patch to fix system path override issue From 5e84d79447ef2af309a73bf851e851253902a8dc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 29 Jul 2018 16:19:35 +0200 Subject: [PATCH 04/48] Update to 1.5.3 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + ...vironment-variables-for-system-paths.patch | 38 ------------------- pkgconf.spec | 13 ++++--- platform-pkg-config.in | 6 +-- sources | 2 +- 5 files changed, 11 insertions(+), 49 deletions(-) delete mode 100644 0001-environment-variables-for-system-paths.patch diff --git a/.gitignore b/.gitignore index 7a86311..d91045f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /pkgconf-1.4.1.tar.xz /pkgconf-1.4.2.tar.xz /pkgconf-1.5.1.tar.xz +/pkgconf-1.5.3.tar.xz diff --git a/0001-environment-variables-for-system-paths.patch b/0001-environment-variables-for-system-paths.patch deleted file mode 100644 index b98cc16..0000000 --- a/0001-environment-variables-for-system-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fb08ae2bd21c0f25d719d1914a07f19cef1a3619 Mon Sep 17 00:00:00 2001 -From: Graham Ollis -Date: Mon, 25 Jun 2018 06:36:57 -0400 -Subject: [PATCH] environment variables for system paths should override - compiled-in defaults - ---- - libpkgconf/client.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/libpkgconf/client.c b/libpkgconf/client.c -index 796014d..f4155b3 100644 ---- a/libpkgconf/client.c -+++ b/libpkgconf/client.c -@@ -96,11 +96,15 @@ pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error - pkgconf_client_set_buildroot_dir(client, NULL); - pkgconf_client_set_prefix_varname(client, NULL); - -- pkgconf_path_copy_list(&client->filter_libdirs, &personality->filter_libdirs); -- pkgconf_path_copy_list(&client->filter_includedirs, &personality->filter_includedirs); -- -- pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", NULL, &client->filter_libdirs, false); -- pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", NULL, &client->filter_includedirs, false); -+ if(getenv("PKG_CONFIG_SYSTEM_LIBRARY_PATH") == NULL) -+ pkgconf_path_copy_list(&client->filter_libdirs, &personality->filter_libdirs); -+ else -+ pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_LIBRARY_PATH", NULL, &client->filter_libdirs, false); -+ -+ if(getenv("PKG_CONFIG_SYSTEM_INCLUDE_PATH") == NULL) -+ pkgconf_path_copy_list(&client->filter_includedirs, &personality->filter_includedirs); -+ else -+ pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", NULL, &client->filter_includedirs, false); - - /* GCC uses these environment variables to define system include paths, so we should check them. */ - #ifdef __HAIKU__ --- -2.17.1 - diff --git a/pkgconf.spec b/pkgconf.spec index 3184c33..f2360c7 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,8 +16,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.5.3 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -27,9 +27,6 @@ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.ta # Simple wrapper script to offer platform versions of pkgconfig Source1: platform-pkg-config.in -# From: https://git.dereferenced.org/pkgconf/pkgconf/pulls/1 -Patch0001: 0001-environment-variables-for-system-paths.patch - BuildRequires: gcc BuildRequires: make @@ -39,7 +36,7 @@ BuildRequires: automake BuildRequires: libtool # For unit tests -BuildRequires: %{_bindir}/kyua +BuildRequires: kyua BuildRequires: atf-tests # pkgconf uses libpkgconf internally @@ -158,6 +155,7 @@ rm -rf %{buildroot}%{_datadir}/aclocal %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_mandir}/man5/pc.5* +%{_mandir}/man5/%{name}-personality.5* %files -n lib%{name} %license COPYING @@ -182,6 +180,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Sun Jul 29 2018 Igor Gnatenko - 1.5.3-1 +- Update to 1.5.3 + * Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/platform-pkg-config.in b/platform-pkg-config.in index f200eb3..d95f153 100644 --- a/platform-pkg-config.in +++ b/platform-pkg-config.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config # Platform: @TARGET_PLATFORM@ @@ -7,6 +7,4 @@ export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" -pkgconf $@ - -exit $? +exec pkgconf "$@" diff --git a/sources b/sources index 83afe72..6a5cdd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.5.1.tar.xz) = a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a +SHA512 (pkgconf-1.5.3.tar.xz) = 565c5caa4fb4cf358c42d2e1f709088810d275b26cdf313140575752fc6ea0bc6d6fd93dd8ee9fbb78b7b39044e5c6df9065acb5963189ea99916bea24a7b371 From 7f3791a11e843a56a3420faf77ae5320a46bc3eb Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 31 Jul 2018 15:16:37 +0200 Subject: [PATCH 05/48] Rebuild with fixed binutils --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index f2360c7..c7b2337 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -180,6 +180,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Tue Jul 31 2018 Florian Weimer - 1.5.3-2 +- Rebuild with fixed binutils + * Sun Jul 29 2018 Igor Gnatenko - 1.5.3-1 - Update to 1.5.3 From 154f36d93d1cb7768e5d26cb7a614ad5d2300368 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 27 Nov 2018 10:26:27 +0100 Subject: [PATCH 06/48] Update to 1.5.4 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + pkgconf.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d91045f..34f3440 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /pkgconf-1.4.2.tar.xz /pkgconf-1.5.1.tar.xz /pkgconf-1.5.3.tar.xz +/pkgconf-1.5.4.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index c7b2337..8a67453 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,8 +16,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.5.3 -Release: 2%{?dist} +Version: 1.5.4 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -180,6 +180,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Tue Nov 27 2018 Igor Gnatenko - 1.5.4-1 +- Update to 1.5.4 + * Tue Jul 31 2018 Florian Weimer - 1.5.3-2 - Rebuild with fixed binutils diff --git a/sources b/sources index 6a5cdd9..1c390d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.5.3.tar.xz) = 565c5caa4fb4cf358c42d2e1f709088810d275b26cdf313140575752fc6ea0bc6d6fd93dd8ee9fbb78b7b39044e5c6df9065acb5963189ea99916bea24a7b371 +SHA512 (pkgconf-1.5.4.tar.xz) = 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93 From 0674fe85a5beac50c4c2b4b51a3ea958c434bdb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 04:18:31 +0000 Subject: [PATCH 07/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 8a67453..d4e92bb 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -180,6 +180,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Nov 27 2018 Igor Gnatenko - 1.5.4-1 - Update to 1.5.4 From d7c5865721f8c1fa8e8a67fa663416ac1ec0f215 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 9 Feb 2019 19:40:28 -0500 Subject: [PATCH 08/48] Update to 1.6.0 - Add personality.d directories for cross-targets - Add pkgconf rpm macros for pkgconf directories --- .gitignore | 1 + pkgconf.spec | 28 ++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 34f3440..4c71f37 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /pkgconf-1.5.1.tar.xz /pkgconf-1.5.3.tar.xz /pkgconf-1.5.4.tar.xz +/pkgconf-1.6.0.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index d4e92bb..b81b724 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,12 +16,13 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.5.4 -Release: 2%{?dist} +Version: 1.6.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 script to offer platform versions of pkgconfig @@ -123,6 +124,16 @@ make check find %{buildroot} -name '*.la' -print -delete +mkdir -p %{buildroot}%{_sysconfdir}/pkgconfig/personality.d +mkdir -p %{buildroot}%{_datadir}/pkgconfig/personality.d + +# pkgconf rpm macros +mkdir -p %{buildroot}%{_rpmmacrodir}/ + +cat > %{buildroot}%{_rpmmacrodir}/macros.pkgconf < %{buildroot}%{_mandir}/man1/pkg-config.1 mkdir -p %{buildroot}%{_libdir}/pkgconfig mkdir -p %{buildroot}%{_datadir}/pkgconfig @@ -156,6 +167,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal %{_mandir}/man1/%{name}.1* %{_mandir}/man5/pc.5* %{_mandir}/man5/%{name}-personality.5* +%{_rpmmacrodir}/macros.pkgconf +%dir %{_sysconfdir}/pkgconfig +%dir %{_sysconfdir}/pkgconfig/personality.d +%dir %{_datadir}/pkgconfig/personality.d %files -n lib%{name} %license COPYING @@ -180,6 +195,11 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Sat Feb 09 2019 Neal Gompa - 1.6.0-1 +- Update to 1.6.0 +- Add personality.d directories for cross-targets +- Add pkgconf rpm macros for pkgconf directories + * Sat Feb 02 2019 Fedora Release Engineering - 1.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 1c390d2..01586af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.5.4.tar.xz) = 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93 +SHA512 (pkgconf-1.6.0.tar.xz) = eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda From 39b0d4a6b2d57d6994ff5003d0c4ed12de6dfe98 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 25 Mar 2019 14:54:07 +0100 Subject: [PATCH 09/48] Update to 1.6.1 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + pkgconf.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4c71f37..1676acf 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /pkgconf-1.5.3.tar.xz /pkgconf-1.5.4.tar.xz /pkgconf-1.6.0.tar.xz +/pkgconf-1.6.1.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index b81b724..3eec5af 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,7 +16,7 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Mon Mar 25 2019 Igor Gnatenko - 1.6.1-1 +- Update to 1.6.1 + * Sat Feb 09 2019 Neal Gompa - 1.6.0-1 - Update to 1.6.0 - Add personality.d directories for cross-targets diff --git a/sources b/sources index 01586af..54ae9f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.6.0.tar.xz) = eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda +SHA512 (pkgconf-1.6.1.tar.xz) = d7314da008ca90858be2ad2599a1bc017da465ef3eae5ab8f18893539ffd557fff3316ae2f2ecf97d34550de6f7a3a3ab3f82ec5eb45e4f0a239b89fe3877835 From eeed211789e6ffb83c0a865d89f39b93198550e6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 12 Jul 2019 09:37:17 +0200 Subject: [PATCH 10/48] Update to 1.6.2 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + pkgconf.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1676acf..3c743fe 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /pkgconf-1.5.4.tar.xz /pkgconf-1.6.0.tar.xz /pkgconf-1.6.1.tar.xz +/pkgconf-1.6.2.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 3eec5af..77931df 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,7 +16,7 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jul 12 09:36:57 CEST 2019 Igor Gnatenko - 1.6.2-1 +- Update to 1.6.2 + * Mon Mar 25 2019 Igor Gnatenko - 1.6.1-1 - Update to 1.6.1 diff --git a/sources b/sources index 54ae9f8..0840c5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.6.1.tar.xz) = d7314da008ca90858be2ad2599a1bc017da465ef3eae5ab8f18893539ffd557fff3316ae2f2ecf97d34550de6f7a3a3ab3f82ec5eb45e4f0a239b89fe3877835 +SHA512 (pkgconf-1.6.2.tar.xz) = 536f8b60aad1211f56b7e236f6bbc1b7821a293b5a77069de6550a2c188e458bd54a94a7be14932ba86c048de4097d792aee90319ad2e498ef3a99eeb22fa43d From 5f77e4a08c15171f3719cc1423b3b50773584271 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 14 Jul 2019 13:23:57 +0200 Subject: [PATCH 11/48] Update to 1.6.3 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + pkgconf.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c743fe..9396f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /pkgconf-1.6.0.tar.xz /pkgconf-1.6.1.tar.xz /pkgconf-1.6.2.tar.xz +/pkgconf-1.6.3.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 77931df..c68ee00 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,7 +16,7 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Sun Jul 14 13:23:30 CEST 2019 Igor Gnatenko - 1.6.3-1 +- Update to 1.6.3 + * Fri Jul 12 09:36:57 CEST 2019 Igor Gnatenko - 1.6.2-1 - Update to 1.6.2 diff --git a/sources b/sources index 0840c5d..9931961 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.6.2.tar.xz) = 536f8b60aad1211f56b7e236f6bbc1b7821a293b5a77069de6550a2c188e458bd54a94a7be14932ba86c048de4097d792aee90319ad2e498ef3a99eeb22fa43d +SHA512 (pkgconf-1.6.3.tar.xz) = 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1 From 0d221e378a29bccb2a7d99aee66b1b51d3cc4653 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 10:47:00 +0000 Subject: [PATCH 12/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index c68ee00..fb4bc2e 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jul 14 13:23:30 CEST 2019 Igor Gnatenko - 1.6.3-1 - Update to 1.6.3 From 39fd3fd387a1268d99f7d10ac216a244b51bd24f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 09:10:02 +0000 Subject: [PATCH 13/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index fb4bc2e..f5febff 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.6.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5ef47b0427f678d2bee2e843bbffbc33dccc1112 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 25 May 2020 05:56:06 +0200 Subject: [PATCH 14/48] Update to 1.7.0 Signed-off-by: Igor Raits --- .gitignore | 1 + pkgconf.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9396f4c..685c0ed 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /pkgconf-1.6.1.tar.xz /pkgconf-1.6.2.tar.xz /pkgconf-1.6.3.tar.xz +/pkgconf-1.7.0.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index f5febff..27eb5b1 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,8 +16,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.6.3 -Release: 3%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Mon May 25 2020 Igor Raits - 1.7.0-1 +- Update to 1.7.0 + * Thu Jan 30 2020 Fedora Release Engineering - 1.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 9931961..71cd84a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.6.3.tar.xz) = 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1 +SHA512 (pkgconf-1.7.0.tar.xz) = 636741c11c35dbe39bbd38760268deefede2c312cb65ac1c20dbb2ce2c4eca884481e5888f5f6987c084f753684ff8d008713f7638952ea1d67a58ecce2fa05d From c7036b133ebbb43f6057822c31a62c1d023ddca3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 22:34:11 +0000 Subject: [PATCH 15/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 27eb5b1..912398d 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon May 25 2020 Igor Raits - 1.7.0-1 - Update to 1.7.0 From ea0f9748e56b070640bb492c3bfd3a25729a7c41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 07:07:38 +0000 Subject: [PATCH 16/48] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 912398d..9b4acd8 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -195,6 +195,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.7.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d7c533a5fe540ab3157d911d8df7c258c67526ed Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 3 Aug 2020 13:11:08 -0400 Subject: [PATCH 17/48] Update to 1.7.3 --- .gitignore | 1 + pkgconf.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 685c0ed..8edb689 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /pkgconf-1.6.2.tar.xz /pkgconf-1.6.3.tar.xz /pkgconf-1.7.0.tar.xz +/pkgconf-1.7.3.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 9b4acd8..d556a68 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -16,8 +16,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.7.0 -Release: 3%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -195,6 +195,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Mon Aug 03 2020 Neal Gompa - 1.7.3-1 +- Update to 1.7.3 + * Sat Aug 01 2020 Fedora Release Engineering - 1.7.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 71cd84a..387d1f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.7.0.tar.xz) = 636741c11c35dbe39bbd38760268deefede2c312cb65ac1c20dbb2ce2c4eca884481e5888f5f6987c084f753684ff8d008713f7638952ea1d67a58ecce2fa05d +SHA512 (pkgconf-1.7.3.tar.xz) = 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6 From 05c8560a2eadac70cdc0e66554b5a4a6ac298f01 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 10 Aug 2020 00:56:48 -0400 Subject: [PATCH 18/48] Add /usr/local paths to pkg-config(1) search path for non RPM builds --- pkgconf.spec | 10 ++++++++-- platform-pkg-config.in | 12 +++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgconf.spec b/pkgconf.spec index d556a68..5ce3e02 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -138,12 +138,15 @@ EOM install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-config sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \ + -e "s|@PKGCONF_LIBDIRS_LOCAL@|/usr/local/%{_lib}/pkgconfig:/usr/local/share/pkgconfig:%{pkgconf_libdirs}|" \ + -e "s|@PKGCONF_SYSLIBDIR_LOCAL@|/usr/local/%{_lib}:%{_libdir}|" \ + -e "s|@PKGCONF_SYSINCDIR_LOCAL@|/usr/local/include:%{_includedir}|" \ -e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \ -e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \ -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ -i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config -ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config +ln -sr %{buildroot}%{_bindir}/%{_target_platform}-pkg-config %{buildroot}%{_bindir}/pkg-config # Link pkg-config(1) to pkgconf(1) echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1 @@ -195,6 +198,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Mon Aug 10 2020 Neal Gompa - 1.7.3-2 +- Add /usr/local paths to pkg-config(1) search path for non RPM builds + * Mon Aug 03 2020 Neal Gompa - 1.7.3-1 - Update to 1.7.3 diff --git a/platform-pkg-config.in b/platform-pkg-config.in index d95f153..51c37d3 100644 --- a/platform-pkg-config.in +++ b/platform-pkg-config.in @@ -3,8 +3,14 @@ # Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config # Platform: @TARGET_PLATFORM@ -export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" -export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" -export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" +if [ -z "${RPM_BUILD_ROOT}" ]; then + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS_LOCAL@}" + export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR_LOCAL@}" + export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR_LOCAL@}" +else + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" + export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" + export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" +fi exec pkgconf "$@" From ac4bf07a6503a65c11209ee137287c316a5e95fc Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 14 Oct 2020 22:35:57 -0400 Subject: [PATCH 19/48] Make /usr/bin/pkg-config multilib safe --- pkg-config.in | 7 +++++++ pkgconf.spec | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 pkg-config.in diff --git a/pkg-config.in b/pkg-config.in new file mode 100644 index 0000000..a5cf821 --- /dev/null +++ b/pkg-config.in @@ -0,0 +1,7 @@ +#!/bin/sh + +# Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config + +HOST_PLATFORM=$(rpm --eval "%{_host}") + +exec "@PKGCONF_BINDIR@/${HOST_PLATFORM}-pkg-config" "$@" diff --git a/pkgconf.spec b/pkgconf.spec index 5ce3e02..1d30b1b 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -25,8 +25,9 @@ URL: http://pkgconf.org/ # Mirror at https://releases.pagure.org/pkgconf/pkgconf/ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz -# Simple wrapper script to offer platform versions of pkgconfig +# Simple wrapper scripts to offer platform versions of pkgconfig Source1: platform-pkg-config.in +Source2: pkg-config.in BuildRequires: gcc BuildRequires: make @@ -146,7 +147,10 @@ sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \ -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ -i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config -ln -sr %{buildroot}%{_bindir}/%{_target_platform}-pkg-config %{buildroot}%{_bindir}/pkg-config +install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/pkg-config + +sed -e "s|@PKGCONF_BINDIR@|%{_bindir}|" \ + -i %{buildroot}%{_bindir}/pkg-config # Link pkg-config(1) to pkgconf(1) echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1 @@ -198,6 +202,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Thu Oct 15 2020 Neal Gompa - 1.7.3-3 +- Make /usr/bin/pkg-config multilib safe + * Mon Aug 10 2020 Neal Gompa - 1.7.3-2 - Add /usr/local paths to pkg-config(1) search path for non RPM builds From 9a091fe4b9494021147e61706754b643ceddaf90 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 15 Oct 2020 07:56:38 -0400 Subject: [PATCH 20/48] Fix pkg-config wrapper for armv7hl --- pkg-config.in | 4 ++-- pkgconf.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg-config.in b/pkg-config.in index a5cf821..9bce77a 100644 --- a/pkg-config.in +++ b/pkg-config.in @@ -2,6 +2,6 @@ # Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config -HOST_PLATFORM=$(rpm --eval "%{_host}") +TARGET_PLATFORM=$(rpm --eval '%{_target_platform}') -exec "@PKGCONF_BINDIR@/${HOST_PLATFORM}-pkg-config" "$@" +exec "@PKGCONF_BINDIR@/${TARGET_PLATFORM}-pkg-config" "$@" diff --git a/pkgconf.spec b/pkgconf.spec index 1d30b1b..5e1bed5 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -202,6 +202,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Thu Oct 15 2020 Neal Gompa - 1.7.3-4 +- Fix pkg-config wrapper for armv7hl + * Thu Oct 15 2020 Neal Gompa - 1.7.3-3 - Make /usr/bin/pkg-config multilib safe From 5dea89a881102185fe291a7a4902a10caa5b9a5e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 19 Oct 2020 14:48:03 -0400 Subject: [PATCH 21/48] Use internal target platform definition for pkg-config wrapper --- pkg-config.in | 3 ++- pkgconf.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg-config.in b/pkg-config.in index 9bce77a..0d12767 100644 --- a/pkg-config.in +++ b/pkg-config.in @@ -2,6 +2,7 @@ # Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config -TARGET_PLATFORM=$(rpm --eval '%{_target_platform}') +## Vendored definition of %_target_platform from redhat-rpm-config to avoid depending on it +TARGET_PLATFORM=$(rpm --eval '%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}') exec "@PKGCONF_BINDIR@/${TARGET_PLATFORM}-pkg-config" "$@" diff --git a/pkgconf.spec b/pkgconf.spec index 5e1bed5..837848a 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -202,6 +202,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Mon Oct 19 2020 Neal Gompa - 1.7.3-5 +- Use internal target platform definition for pkg-config wrapper + * Thu Oct 15 2020 Neal Gompa - 1.7.3-4 - Fix pkg-config wrapper for armv7hl From be0c74bf728ef71ca95337cfc01eb1437ec2a8c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:09:29 +0000 Subject: [PATCH 22/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 837848a..034fa2a 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -17,7 +17,7 @@ Name: pkgconf Version: 1.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -202,6 +202,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.7.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 19 2020 Neal Gompa - 1.7.3-5 - Use internal target platform definition for pkg-config wrapper From 880f7e1ca11d5de939aa652d603cc7d6b847ab42 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 22 Feb 2021 16:34:47 +0100 Subject: [PATCH 23/48] Add option to disable unit tests kyua is currently broken if compiled with GCC 11[0]. It prevents pkgconf to build successfully as the unit tests are enabled in check phase. Disable the tests on RHEL due to its extensive (from RHEL POV) dependencies. [0] - https://bugzilla.redhat.com/show_bug.cgi?id=1926779 --- pkgconf.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 034fa2a..f5c77cd 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -12,12 +12,19 @@ %global pkgconfig_evr 1:%{pkgconfig_verrel} %endif +# Tests are disabled on RHEL 9 because of the extensive dependencies +%if 0%{?rhel} >= 9 +%bcond_with tests +%else +%bcond_without tests +%endif + # Search path for pc files for pkgconf %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf Version: 1.7.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -37,9 +44,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +%if %{with tests} # For unit tests BuildRequires: kyua BuildRequires: atf-tests +%endif # pkgconf uses libpkgconf internally Requires: lib%{name}%{?_isa} = %{version}-%{release} @@ -117,7 +126,9 @@ autoreconf -fiv %check +%if %{with tests} make check +%endif %install @@ -202,6 +213,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Mon Feb 22 2021 Tomas Popela - 1.7.3-7 +- Conditionalize the unit tests, disable them on RHEL 9 + * Wed Jan 27 2021 Fedora Release Engineering - 1.7.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e0de8e8cba608bc5db1299d0ed2e6c3daf100b9a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 28 Apr 2021 11:31:40 -0400 Subject: [PATCH 24/48] Update to 1.7.4 - Don't add /usr/local to syspaths (#1953348) --- .gitignore | 1 + pkgconf.spec | 10 ++++++---- platform-pkg-config.in | 6 ++---- sources | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8edb689..8db2aff 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /pkgconf-1.6.3.tar.xz /pkgconf-1.7.0.tar.xz /pkgconf-1.7.3.tar.xz +/pkgconf-1.7.4.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index f5c77cd..265068a 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -23,8 +23,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.7.3 -Release: 7%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -151,8 +151,6 @@ install -pm 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{_target_platform}-pkg-confi sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \ -e "s|@PKGCONF_LIBDIRS_LOCAL@|/usr/local/%{_lib}/pkgconfig:/usr/local/share/pkgconfig:%{pkgconf_libdirs}|" \ - -e "s|@PKGCONF_SYSLIBDIR_LOCAL@|/usr/local/%{_lib}:%{_libdir}|" \ - -e "s|@PKGCONF_SYSINCDIR_LOCAL@|/usr/local/include:%{_includedir}|" \ -e "s|@PKGCONF_LIBDIRS@|%{pkgconf_libdirs}|" \ -e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \ -e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \ @@ -213,6 +211,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Wed Apr 28 2021 Neal Gompa - 1.7.4-1 +- Update to 1.7.4 +- Don't add /usr/local to syspaths (#1953348) + * Mon Feb 22 2021 Tomas Popela - 1.7.3-7 - Conditionalize the unit tests, disable them on RHEL 9 diff --git a/platform-pkg-config.in b/platform-pkg-config.in index 51c37d3..e5148e7 100644 --- a/platform-pkg-config.in +++ b/platform-pkg-config.in @@ -5,12 +5,10 @@ if [ -z "${RPM_BUILD_ROOT}" ]; then export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS_LOCAL@}" - export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR_LOCAL@}" - export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR_LOCAL@}" else export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}" - export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" - export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" fi +export PKG_CONFIG_SYSTEM_LIBRARY_PATH="${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-@PKGCONF_SYSLIBDIR@}" +export PKG_CONFIG_SYSTEM_INCLUDE_PATH="${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-@PKGCONF_SYSINCDIR@}" exec pkgconf "$@" diff --git a/sources b/sources index 387d1f1..8290651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.7.3.tar.xz) = 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6 +SHA512 (pkgconf-1.7.4.tar.xz) = 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1 From 928e1c3a2c522210f51474044fe798ec241e3f92 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 23 Jun 2021 14:05:47 +0200 Subject: [PATCH 25/48] Don't prepend sysroot_dir if pkg-config file lies outside of sysroot_dir (#1974883) --- pkgconf.spec | 10 +++- pkgconf_sysrootdir.patch | 105 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 pkgconf_sysrootdir.patch diff --git a/pkgconf.spec b/pkgconf.spec index 265068a..01f7fff 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -36,6 +36,11 @@ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.ta Source1: platform-pkg-config.in Source2: pkg-config.in +# Don't prepend sysroot_dir if pkg-config file lies outside of sysroot_dir +# See https://github.com/pkgconf/pkgconf/issues/213 +# See https://bugzilla.redhat.com/show_bug.cgi?id=1974883 +Patch0: pkgconf_sysrootdir.patch + BuildRequires: gcc BuildRequires: make @@ -211,6 +216,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Wed Jun 23 2021 Sandro Mani - 1.7.4-2 +- Don't prepend sysroot_dir if pkg-config file lies outside of sysroot_dir (#1974883) + * Wed Apr 28 2021 Neal Gompa - 1.7.4-1 - Update to 1.7.4 - Don't add /usr/local to syspaths (#1953348) diff --git a/pkgconf_sysrootdir.patch b/pkgconf_sysrootdir.patch new file mode 100644 index 0000000..2a78143 --- /dev/null +++ b/pkgconf_sysrootdir.patch @@ -0,0 +1,105 @@ +diff -rupN pkgconf-1.7.4/libpkgconf/pkg.c pkgconf-1.7.4-new/libpkgconf/pkg.c +--- pkgconf-1.7.4/libpkgconf/pkg.c 2021-03-18 12:39:45.000000000 +0100 ++++ pkgconf-1.7.4-new/libpkgconf/pkg.c 2021-06-23 13:44:22.165843998 +0200 +@@ -378,6 +378,16 @@ pkgconf_pkg_new_from_file(pkgconf_client + pkg->pc_filedir = pkg_get_parent_dir(pkg); + pkgconf_tuple_add(client, &pkg->vars, "pcfiledir", pkg->pc_filedir, true); + ++ /* If pc_filedir is outside of sysroot_dir, clear pc_filedir ++ /* See https://github.com/pkgconf/pkgconf/issues/213 ++ */ ++ if (client->sysroot_dir && strncmp(pkg->pc_filedir, client->sysroot_dir, strlen(client->sysroot_dir))) ++ { ++ free(client->sysroot_dir); ++ client->sysroot_dir = NULL; ++ pkgconf_client_set_sysroot_dir(client, NULL); ++ } ++ + /* make module id */ + if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL) + idptr++; +diff -rupN pkgconf-1.7.4/tests/regress.sh pkgconf-1.7.4-new/tests/regress.sh +--- pkgconf-1.7.4/tests/regress.sh 2019-07-12 13:10:54.000000000 +0200 ++++ pkgconf-1.7.4-new/tests/regress.sh 2021-06-23 14:03:28.363283396 +0200 +@@ -112,7 +112,7 @@ libs_never_mergeback_body() + export PKG_CONFIG_PATH="${selfdir}/lib1" + atf_check \ + -o inline:"-L/test/bar/lib -lfoo1 \n" \ +- pkgconf --libs prefix-foo1 ++ pkgconf --libs prefix-foo1 + atf_check \ + -o inline:"-L/test/bar/lib -lfoo1 -lfoo2 \n" \ + pkgconf --libs prefix-foo1 prefix-foo2 +@@ -160,9 +160,9 @@ isystem_munge_order_body() + + isystem_munge_sysroot_body() + { +- export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR='/test' ++ export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" + atf_check \ +- -o match:"-isystem /test/opt/bad/include" \ ++ -o match:"-isystem ${selfdir}/opt/bad/include" \ + pkgconf --cflags isystem + } + +@@ -176,9 +176,9 @@ idirafter_munge_order_body() + + idirafter_munge_sysroot_body() + { +- export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR='/test' ++ export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" + atf_check \ +- -o match:"-idirafter /test/opt/bad/include" \ ++ -o match:"-idirafter ${selfdir}/opt/bad/include" \ + pkgconf --cflags idirafter + } + +@@ -195,20 +195,16 @@ pcpath_body() + export PKG_CONFIG_PATH="${selfdir}/lib2" + atf_check \ + -o inline:"-fPIC -I/test/include/foo \n" \ +- pkgconf --cflags ${selfdir}/lib3/bar.pc ++ pkgconf --cflags ${selfdir}/lib3/bar.pc + } + + sysroot_munge_body() + { +- export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="/sysroot" ++ sed "s|/sysroot/|${selfdir}/|g" ${selfdir}/lib1/sysroot-dir.pc > ${selfdir}/lib1/sysroot-dir-selfdir.pc ++ export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" + atf_check \ +- -o inline:"-L/sysroot/lib -lfoo \n" \ +- pkgconf --libs sysroot-dir +- +- export PKG_CONFIG_SYSROOT_DIR="/sysroot2" +- atf_check \ +- -o inline:"-L/sysroot2/sysroot/lib -lfoo \n" \ +- pkgconf --libs sysroot-dir ++ -o inline:"-L${selfdir}/lib -lfoo \n" \ ++ pkgconf --libs sysroot-dir-selfdir + } + + virtual_variable_body() +@@ -244,8 +240,8 @@ malformed_quoting_body() + + explicit_sysroot_body() + { +- export PKG_CONFIG_SYSROOT_DIR=/sysroot +- atf_check -o inline:"/sysroot/usr/share/test\n" \ ++ export PKG_CONFIG_SYSROOT_DIR=${selfdir} ++ atf_check -o inline:"${selfdir}/usr/share/test\n" \ + pkgconf --with-path="${selfdir}/lib1" --variable=pkgdatadir explicit-sysroot + } + +diff -rupN pkgconf-1.7.4/tests/test_env.sh.in pkgconf-1.7.4-new/tests/test_env.sh.in +--- pkgconf-1.7.4/tests/test_env.sh.in 2019-07-12 15:23:36.000000000 +0200 ++++ pkgconf-1.7.4-new/tests/test_env.sh.in 2021-06-23 13:05:03.614916117 +0200 +@@ -24,7 +24,7 @@ done + selfdir="@abs_top_srcdir@/tests" + LIBRARY_PATH_ENV="LIBRARY_PATH" + PATH_SEP=":" +-SYSROOT_DIR="${selfdir}/test" ++SYSROOT_DIR="${selfdir}" + case "$(uname -s)" in + Msys|CYGWIN*) PATH_SEP=";";; + Haiku) LIBRARY_PATH_ENV="BELIBRARIES";; From cb8ca352d3fdabdd9dda908860841dd6d9ceae59 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 23 Jun 2021 08:59:07 -0400 Subject: [PATCH 26/48] Allow tests to fail in %check to deal with kyua's flakiness Unfortunately, kyua has not being working properly lately, and the test suite has become somewhat flaky as a result. Until this can be properly resolved, allow the tests to fail. --- pkgconf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 01f7fff..ae5181c 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -132,7 +132,7 @@ autoreconf -fiv %check %if %{with tests} -make check +make check || : %endif From 74fa3e84833a161e1581e6cde60c61b9365a6fa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:32:57 +0000 Subject: [PATCH 27/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index ae5181c..91740b4 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -216,6 +216,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 23 2021 Sandro Mani - 1.7.4-2 - Don't prepend sysroot_dir if pkg-config file lies outside of sysroot_dir (#1974883) From 5640c97a7ae7b2b4ff35f471b01d39fd87f33588 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 25 Jul 2021 09:51:14 -0400 Subject: [PATCH 28/48] Update to 1.8.0 --- .gitignore | 1 + pkgconf.spec | 12 ++--- pkgconf_sysrootdir.patch | 105 --------------------------------------- sources | 2 +- 4 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 pkgconf_sysrootdir.patch diff --git a/.gitignore b/.gitignore index 8db2aff..0bc55dd 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /pkgconf-1.7.0.tar.xz /pkgconf-1.7.3.tar.xz /pkgconf-1.7.4.tar.xz +/pkgconf-1.8.0.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 91740b4..3e43952 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -23,8 +23,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.7.4 -Release: 3%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -36,11 +36,6 @@ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.ta Source1: platform-pkg-config.in Source2: pkg-config.in -# Don't prepend sysroot_dir if pkg-config file lies outside of sysroot_dir -# See https://github.com/pkgconf/pkgconf/issues/213 -# See https://bugzilla.redhat.com/show_bug.cgi?id=1974883 -Patch0: pkgconf_sysrootdir.patch - BuildRequires: gcc BuildRequires: make @@ -216,6 +211,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Sun Jul 25 2021 Neal Gompa - 1.8.0-1 +- Update to 1.8.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.7.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/pkgconf_sysrootdir.patch b/pkgconf_sysrootdir.patch deleted file mode 100644 index 2a78143..0000000 --- a/pkgconf_sysrootdir.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -rupN pkgconf-1.7.4/libpkgconf/pkg.c pkgconf-1.7.4-new/libpkgconf/pkg.c ---- pkgconf-1.7.4/libpkgconf/pkg.c 2021-03-18 12:39:45.000000000 +0100 -+++ pkgconf-1.7.4-new/libpkgconf/pkg.c 2021-06-23 13:44:22.165843998 +0200 -@@ -378,6 +378,16 @@ pkgconf_pkg_new_from_file(pkgconf_client - pkg->pc_filedir = pkg_get_parent_dir(pkg); - pkgconf_tuple_add(client, &pkg->vars, "pcfiledir", pkg->pc_filedir, true); - -+ /* If pc_filedir is outside of sysroot_dir, clear pc_filedir -+ /* See https://github.com/pkgconf/pkgconf/issues/213 -+ */ -+ if (client->sysroot_dir && strncmp(pkg->pc_filedir, client->sysroot_dir, strlen(client->sysroot_dir))) -+ { -+ free(client->sysroot_dir); -+ client->sysroot_dir = NULL; -+ pkgconf_client_set_sysroot_dir(client, NULL); -+ } -+ - /* make module id */ - if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL) - idptr++; -diff -rupN pkgconf-1.7.4/tests/regress.sh pkgconf-1.7.4-new/tests/regress.sh ---- pkgconf-1.7.4/tests/regress.sh 2019-07-12 13:10:54.000000000 +0200 -+++ pkgconf-1.7.4-new/tests/regress.sh 2021-06-23 14:03:28.363283396 +0200 -@@ -112,7 +112,7 @@ libs_never_mergeback_body() - export PKG_CONFIG_PATH="${selfdir}/lib1" - atf_check \ - -o inline:"-L/test/bar/lib -lfoo1 \n" \ -- pkgconf --libs prefix-foo1 -+ pkgconf --libs prefix-foo1 - atf_check \ - -o inline:"-L/test/bar/lib -lfoo1 -lfoo2 \n" \ - pkgconf --libs prefix-foo1 prefix-foo2 -@@ -160,9 +160,9 @@ isystem_munge_order_body() - - isystem_munge_sysroot_body() - { -- export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR='/test' -+ export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" - atf_check \ -- -o match:"-isystem /test/opt/bad/include" \ -+ -o match:"-isystem ${selfdir}/opt/bad/include" \ - pkgconf --cflags isystem - } - -@@ -176,9 +176,9 @@ idirafter_munge_order_body() - - idirafter_munge_sysroot_body() - { -- export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR='/test' -+ export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" - atf_check \ -- -o match:"-idirafter /test/opt/bad/include" \ -+ -o match:"-idirafter ${selfdir}/opt/bad/include" \ - pkgconf --cflags idirafter - } - -@@ -195,20 +195,16 @@ pcpath_body() - export PKG_CONFIG_PATH="${selfdir}/lib2" - atf_check \ - -o inline:"-fPIC -I/test/include/foo \n" \ -- pkgconf --cflags ${selfdir}/lib3/bar.pc -+ pkgconf --cflags ${selfdir}/lib3/bar.pc - } - - sysroot_munge_body() - { -- export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="/sysroot" -+ sed "s|/sysroot/|${selfdir}/|g" ${selfdir}/lib1/sysroot-dir.pc > ${selfdir}/lib1/sysroot-dir-selfdir.pc -+ export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" - atf_check \ -- -o inline:"-L/sysroot/lib -lfoo \n" \ -- pkgconf --libs sysroot-dir -- -- export PKG_CONFIG_SYSROOT_DIR="/sysroot2" -- atf_check \ -- -o inline:"-L/sysroot2/sysroot/lib -lfoo \n" \ -- pkgconf --libs sysroot-dir -+ -o inline:"-L${selfdir}/lib -lfoo \n" \ -+ pkgconf --libs sysroot-dir-selfdir - } - - virtual_variable_body() -@@ -244,8 +240,8 @@ malformed_quoting_body() - - explicit_sysroot_body() - { -- export PKG_CONFIG_SYSROOT_DIR=/sysroot -- atf_check -o inline:"/sysroot/usr/share/test\n" \ -+ export PKG_CONFIG_SYSROOT_DIR=${selfdir} -+ atf_check -o inline:"${selfdir}/usr/share/test\n" \ - pkgconf --with-path="${selfdir}/lib1" --variable=pkgdatadir explicit-sysroot - } - -diff -rupN pkgconf-1.7.4/tests/test_env.sh.in pkgconf-1.7.4-new/tests/test_env.sh.in ---- pkgconf-1.7.4/tests/test_env.sh.in 2019-07-12 15:23:36.000000000 +0200 -+++ pkgconf-1.7.4-new/tests/test_env.sh.in 2021-06-23 13:05:03.614916117 +0200 -@@ -24,7 +24,7 @@ done - selfdir="@abs_top_srcdir@/tests" - LIBRARY_PATH_ENV="LIBRARY_PATH" - PATH_SEP=":" --SYSROOT_DIR="${selfdir}/test" -+SYSROOT_DIR="${selfdir}" - case "$(uname -s)" in - Msys|CYGWIN*) PATH_SEP=";";; - Haiku) LIBRARY_PATH_ENV="BELIBRARIES";; diff --git a/sources b/sources index 8290651..6134f48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.7.4.tar.xz) = 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1 +SHA512 (pkgconf-1.8.0.tar.xz) = 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28 From 7bfc67f0f616d5e3f5b940f8824ae5ac986e3ba2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:57:15 +0000 Subject: [PATCH 29/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 3e43952..8b20863 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -211,6 +211,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Jul 25 2021 Neal Gompa - 1.8.0-1 - Update to 1.8.0 From a3c313d27638ec41bf3023344cc0c0786ae59828 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:52:04 +0000 Subject: [PATCH 30/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 8b20863..c974bd0 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -211,6 +211,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a888a3102a7389bedd67d2604e9ecb77186436eb Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Tue, 1 Nov 2022 17:05:10 +0000 Subject: [PATCH 31/48] Require system-rpm-config, as that is not installed by default pkg-config queries the system vendor, host type, etc. This information is provided via system-rpm-config (via the redhat-rpm-config) package. Depend on it to avoid failures. --- pkgconf.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index c974bd0..e3ff2d3 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -52,6 +52,7 @@ BuildRequires: atf-tests # pkgconf uses libpkgconf internally Requires: lib%{name}%{?_isa} = %{version}-%{release} +Requires: system-rpm-config # This is defined within pkgconf code as a virtual pc (just like in pkgconfig) Provides: pkgconfig(pkgconf) = %{version} @@ -211,6 +212,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Tue Nov 01 2022 Amit Shah - 1.8.0-4 +- Depend on system-rpm-config + * Fri Jul 22 2022 Fedora Release Engineering - 1.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b86ca0ad0a8f930d4c5e5bbf93b0f9a3e24ea99b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:45:06 +0000 Subject: [PATCH 32/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index e3ff2d3..e7b352a 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -212,6 +212,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 01 2022 Amit Shah - 1.8.0-4 - Depend on system-rpm-config From 946ebc268f69a005d5a1394dec7ca5f0bcce79a1 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 22 Feb 2023 07:00:42 -0500 Subject: [PATCH 33/48] Drop dependency on system-rpm-config (#2172406) --- pkgconf.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgconf.spec b/pkgconf.spec index e7b352a..c0d13d1 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -24,7 +24,7 @@ Name: pkgconf Version: 1.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -52,7 +52,6 @@ BuildRequires: atf-tests # pkgconf uses libpkgconf internally Requires: lib%{name}%{?_isa} = %{version}-%{release} -Requires: system-rpm-config # This is defined within pkgconf code as a virtual pc (just like in pkgconfig) Provides: pkgconfig(pkgconf) = %{version} @@ -212,6 +211,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %endif %changelog +* Wed Feb 22 2023 Neal Gompa - 1.8.0-6 +- Drop dependency on system-rpm-config (#2172406) + * Fri Jan 20 2023 Fedora Release Engineering - 1.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5d2464c09187d27a481769e1420d7f55a8ee6c39 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 22 Feb 2023 07:48:51 -0500 Subject: [PATCH 34/48] Rebase to 1.9.4 --- .gitignore | 1 + pkgconf.spec | 19 +++++++++++++++++-- sources | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0bc55dd..89d304a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /pkgconf-1.7.3.tar.xz /pkgconf-1.7.4.tar.xz /pkgconf-1.8.0.tar.xz +/pkgconf-1.9.4.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index c0d13d1..2c7b4ca 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -23,8 +23,8 @@ %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig Name: pkgconf -Version: 1.8.0 -Release: 6%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -111,6 +111,14 @@ the system provider of pkg-config. %endif +%package -n bomtool +Summary: Simple SBOM generator using pc(5) files +Requires: lib%{name}%{?_isa} = %{version}-%{release} + +%description -n bomtool +bomtool is a program which helps generate a Software Bill of Materials +manifest using data from installed .pc files. + %prep %autosetup -p1 @@ -210,7 +218,14 @@ rm -rf %{buildroot}%{_datadir}/aclocal %dir %{_datadir}/pkgconfig %endif +%files -n bomtool +%{_bindir}/bomtool + + %changelog +* Wed Feb 22 2023 Neal Gompa - 1.9.4-1 +- Rebase to 1.9.4 + * Wed Feb 22 2023 Neal Gompa - 1.8.0-6 - Drop dependency on system-rpm-config (#2172406) diff --git a/sources b/sources index 6134f48..db993e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.8.0.tar.xz) = 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28 +SHA512 (pkgconf-1.9.4.tar.xz) = 079436244f3942161f91c961c96d382a85082079c9843fec5ddd7fb245ba7500a9f7a201b5ef2c70a7a079fe1aacf3a52b73de5402a6f061df87bcdcf0a90755 From 930106a9359d866a6591b27e797fd396b2013b08 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 23 Feb 2023 11:56:00 -0500 Subject: [PATCH 35/48] Track libpkgconf shared object major version We want to be aware when the ABI breaks rather than accidentally having it slip through. --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 2c7b4ca..b4191a7 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -22,6 +22,9 @@ # Search path for pc files for pkgconf %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig +# libpkgconf soversion major version +%global libsomajor 4 + Name: pkgconf Version: 1.9.4 Release: 1%{?dist} @@ -198,7 +201,7 @@ rm -rf %{buildroot}%{_datadir}/aclocal %files -n lib%{name} %license COPYING -%{_libdir}/lib%{name}*.so.* +%{_libdir}/lib%{name}*.so.%{libsomajor}{,.*} %files -n lib%{name}-devel %{_libdir}/lib%{name}*.so From 409e327b4ee6f529d45a3823b129c97037b6fa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 16 May 2023 00:13:45 +0100 Subject: [PATCH 36/48] Rebuild for ATF soname bump --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index b4191a7..6d58487 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -27,7 +27,7 @@ Name: pkgconf Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Mon May 15 2023 Sérgio Basto - 1.9.4-2 +- Rebuild for ATF soname bump + * Wed Feb 22 2023 Neal Gompa - 1.9.4-1 - Rebase to 1.9.4 From 30ee2e6f48eb9f5734bf567904e6081a652192fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 16 May 2023 01:17:08 +0100 Subject: [PATCH 37/48] Update pkgconf to 1.9.5 (#2192963) --- .gitignore | 1 + pkgconf.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 89d304a..9a189b3 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /pkgconf-1.7.4.tar.xz /pkgconf-1.8.0.tar.xz /pkgconf-1.9.4.tar.xz +/pkgconf-1.9.5.tar.xz diff --git a/pkgconf.spec b/pkgconf.spec index 6d58487..56f3cf4 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -26,8 +26,8 @@ %global libsomajor 4 Name: pkgconf -Version: 1.9.4 -Release: 2%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Tue May 16 2023 Sérgio Basto - 1.9.5-1 +- Update pkgconf to 1.9.5 (#2192963) + * Mon May 15 2023 Sérgio Basto - 1.9.4-2 - Rebuild for ATF soname bump diff --git a/sources b/sources index db993e4..1f47994 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.9.4.tar.xz) = 079436244f3942161f91c961c96d382a85082079c9843fec5ddd7fb245ba7500a9f7a201b5ef2c70a7a079fe1aacf3a52b73de5402a6f061df87bcdcf0a90755 +SHA512 (pkgconf-1.9.5.tar.xz) = 604853d8bb1c3ca14e696f83ac5b161e2592defb921d53e1c16cc949d4b9ecac2b12983c1fbbb3c89898323bda18c8749bff3946e049c8305a1a39a773265f09 From 6b503112b793872e7ffd6ccb043c9cb4cb30a3e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:39:13 +0000 Subject: [PATCH 38/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pkgconf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgconf.spec b/pkgconf.spec index 56f3cf4..f391ace 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -27,7 +27,7 @@ Name: pkgconf Version: 1.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package compiler and linker metadata toolkit License: ISC @@ -226,6 +226,9 @@ rm -rf %{buildroot}%{_datadir}/aclocal %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 16 2023 Sérgio Basto - 1.9.5-1 - Update pkgconf to 1.9.5 (#2192963) From 71d012911744d8e28c471df4e1fc3fd5a3f8f79b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:48:18 +0000 Subject: [PATCH 39/48] 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 40/48] 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 41/48] 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 42/48] 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 43/48] 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 44/48] 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 45/48] 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 46/48] 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 47/48] 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 48/48] 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