diff --git a/.gitignore b/.gitignore index 8edb689..a2a6059 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,10 @@ /pkgconf-1.6.3.tar.xz /pkgconf-1.7.0.tar.xz /pkgconf-1.7.3.tar.xz +/pkgconf-1.7.4.tar.xz +/pkgconf-1.8.0.tar.xz +/pkgconf-1.9.4.tar.xz +/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 f5c77cd..d837cf3 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,23 +9,30 @@ %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 +%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 Name: pkgconf -Version: 1.7.3 -Release: 7%{?dist} +Version: 2.3.0 +Release: 3%{?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/ -# 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 @@ -79,7 +82,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} @@ -111,6 +114,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 @@ -127,7 +138,7 @@ autoreconf -fiv %check %if %{with tests} -make check +make check || : %endif @@ -151,8 +162,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}|" \ @@ -192,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 @@ -212,7 +221,77 @@ rm -rf %{buildroot}%{_datadir}/aclocal %dir %{_datadir}/pkgconfig %endif +%files -n bomtool +%{_bindir}/bomtool + + %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 + +* 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 + +* 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 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* 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 + +* 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) + +* 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..ede70b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pkgconf-1.7.3.tar.xz) = 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6 +SHA512 (pkgconf-2.3.0.tar.xz) = 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c