3 changed files with 18 additions and 91 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,8 +29,3 @@
 /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
--- a/pkgconf.spec
+++ b/pkgconf.spec
@ -1,5 +1,9 @@
-# pkgconf acts as pkgconfig
-%bcond pkgconfig_compat 1
+# pkgconf acts as pkgconfig for Fedora and EL8+
+%if (0%{?rhel} && 0%{?rhel} <= 7)
+%bcond_with pkgconfig_compat
+%else
+%bcond_without pkgconfig_compat
+%endif

 %if %{with pkgconfig_compat}
 %global pkgconfig_ver 0.29.1
@ -9,30 +13,23 @@
 %endif

 # Tests are disabled on RHEL 9 because of the extensive dependencies
-%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
+%if 0%{?rhel} >= 9
+%bcond_with tests
 %else
-%global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
+%bcond_without tests
 %endif

-# libpkgconf soversion major version
-%global libsomajor 5
+# Search path for pc files for pkgconf
+%global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig

 Name:           pkgconf
-Version:        2.3.0
-Release:        3%{?dist}
+Version:        1.8.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
-# 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
+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
@ -82,7 +79,7 @@ to use functionality provided by %{name}.
 %if %{with pkgconfig_compat}
 %package m4
 Summary:        m4 macros for pkgconf
-License:        GPL-2.0-or-later WITH Autoconf-exception-generic
+License:        GPLv2+ with exceptions
 BuildArch:      noarch
 # Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it
 Conflicts:      pkgconfig < %{pkgconfig_evr}
@ -114,14 +111,6 @@ 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
@ -201,7 +190,7 @@ rm -rf %{buildroot}%{_datadir}/aclocal

 %files -n lib%{name}
 %license COPYING
-%{_libdir}/lib%{name}*.so.%{libsomajor}{,.*}
+%{_libdir}/lib%{name}*.so.*

 %files -n lib%{name}-devel
 %{_libdir}/lib%{name}*.so
@ -221,64 +210,7 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 %dir %{_datadir}/pkgconfig
 %endif

-%files -n bomtool
-%{_bindir}/bomtool
-
-
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Aug 07 2024 Neal Gompa <ngompa@fedoraproject.org> - 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 <releng@fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue May 14 2024 Jens Petersen <petersen@redhat.com> - 2.1.1-1
- https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.1/NEWS
-
-* Mon Feb 12 2024 Jens Petersen <petersen@redhat.com> - 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 <releng@fedoraproject.org> - 1.9.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 16 2023 Sérgio Basto <sergio@serjux.com> - 1.9.5-1
- Update pkgconf to 1.9.5 (#2192963)
-
-* Mon May 15 2023 Sérgio Basto <sergio@serjux.com> - 1.9.4-2
- Rebuild for ATF soname bump
-
-* Wed Feb 22 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.9.4-1
- Rebase to 1.9.4
-
-* Wed Feb 22 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.8.0-6
- Drop dependency on system-rpm-config (#2172406)
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Nov 01 2022 Amit Shah <amitshah@fedoraproject.org> - 1.8.0-4
- Depend on system-rpm-config
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Sun Jul 25 2021 Neal Gompa <ngompa@fedoraproject.org> - 1.8.0-1
 - Update to 1.8.0

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (pkgconf-2.3.0.tar.xz) = 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c
+SHA512 (pkgconf-1.8.0.tar.xz) = 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28