Compare commits
No commits in common. "rawhide" and "f32" have entirely different histories.
5 changed files with 16 additions and 165 deletions
9
.gitignore
vendored
9
.gitignore
vendored
|
|
@ -25,12 +25,3 @@
|
|||
/pkgconf-1.6.1.tar.xz
|
||||
/pkgconf-1.6.2.tar.xz
|
||||
/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
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Multilib safe wrapper for pkg-config to call correct platform-specific version of pkg-config
|
||||
|
||||
## 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" "$@"
|
||||
156
pkgconf.spec
156
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
|
||||
|
|
@ -8,36 +12,21 @@
|
|||
%global pkgconfig_evr 1:%{pkgconfig_verrel}
|
||||
%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
|
||||
%else
|
||||
%global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
|
||||
%endif
|
||||
|
||||
# libpkgconf soversion major version
|
||||
%global libsomajor 5
|
||||
|
||||
Name: pkgconf
|
||||
Version: 2.3.0
|
||||
Version: 1.6.3
|
||||
Release: 3%{?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
|
||||
# Simple wrapper script to offer platform versions of pkgconfig
|
||||
Source1: platform-pkg-config.in
|
||||
Source2: pkg-config.in
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
|
|
@ -47,11 +36,9 @@ 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}
|
||||
|
|
@ -82,7 +69,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 +101,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
|
||||
|
|
@ -137,9 +116,7 @@ autoreconf -fiv
|
|||
|
||||
|
||||
%check
|
||||
%if %{with tests}
|
||||
make check || :
|
||||
%endif
|
||||
make check
|
||||
|
||||
|
||||
%install
|
||||
|
|
@ -161,16 +138,12 @@ 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_LIBDIRS@|%{pkgconf_libdirs}|" \
|
||||
-e "s|@PKGCONF_SYSLIBDIR@|%{_libdir}|" \
|
||||
-e "s|@PKGCONF_SYSINCDIR@|%{_includedir}|" \
|
||||
-i %{buildroot}%{_bindir}/%{_target_platform}-pkg-config
|
||||
|
||||
install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/pkg-config
|
||||
|
||||
sed -e "s|@PKGCONF_BINDIR@|%{_bindir}|" \
|
||||
-i %{buildroot}%{_bindir}/pkg-config
|
||||
ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
|
||||
|
||||
# Link pkg-config(1) to pkgconf(1)
|
||||
echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/pkg-config.1
|
||||
|
|
@ -201,7 +174,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,108 +194,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
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jun 23 2021 Sandro Mani <manisandro@gmail.com> - 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 <ngompa13@gmail.com> - 1.7.4-1
|
||||
- Update to 1.7.4
|
||||
- Don't add /usr/local to syspaths (#1953348)
|
||||
|
||||
* Mon Feb 22 2021 Tomas Popela <tpopela@redhat.com> - 1.7.3-7
|
||||
- Conditionalize the unit tests, disable them on RHEL 9
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Oct 19 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-5
|
||||
- Use internal target platform definition for pkg-config wrapper
|
||||
|
||||
* Thu Oct 15 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-4
|
||||
- Fix pkg-config wrapper for armv7hl
|
||||
|
||||
* Thu Oct 15 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-3
|
||||
- Make /usr/bin/pkg-config multilib safe
|
||||
|
||||
* Mon Aug 10 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-2
|
||||
- Add /usr/local paths to pkg-config(1) search path for non RPM builds
|
||||
|
||||
* Mon Aug 03 2020 Neal Gompa <ngompa13@gmail.com> - 1.7.3-1
|
||||
- Update to 1.7.3
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon May 25 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.7.0-1
|
||||
- Update to 1.7.0
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,7 @@
|
|||
# Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config
|
||||
# Platform: @TARGET_PLATFORM@
|
||||
|
||||
if [ -z "${RPM_BUILD_ROOT}" ]; then
|
||||
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS_LOCAL@}"
|
||||
else
|
||||
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR:-@PKGCONF_LIBDIRS@}"
|
||||
fi
|
||||
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@}"
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (pkgconf-2.3.0.tar.xz) = 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c
|
||||
SHA512 (pkgconf-1.6.3.tar.xz) = 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue