From be0c74bf728ef71ca95337cfc01eb1437ec2a8c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:09:29 +0000 Subject: [PATCH 01/27] - 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 02/27] 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 03/27] 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 04/27] 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 05/27] 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 06/27] - 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 07/27] 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 08/27] - 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 09/27] 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 10/27] 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 11/27] 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 12/27] 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 13/27] 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 14/27] 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 15/27] 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 16/27] 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 17/27] 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 18/27] 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 19/27] 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 20/27] 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 21/27] 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 22/27] 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 23/27] 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 24/27] 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 25/27] 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 26/27] 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 27/27] 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