Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
35
.gitignore
vendored
35
.gitignore
vendored
@ -1 +1,34 @@
|
||||
SOURCES/pkgconf-1.4.2.tar.xz
|
||||
/pkgconf-1.1.0.tar.xz
|
||||
/pkgconf-1.1.1.tar.xz
|
||||
/pkgconf-1.2.0.tar.xz
|
||||
/pkgconf-1.2.1.tar.xz
|
||||
/pkgconf-1.2.2.tar.xz
|
||||
/pkgconf-1.3.0.tar.xz
|
||||
/pkgconf-1.3.2.tar.xz
|
||||
/pkgconf-1.3.3.tar.xz
|
||||
/pkgconf-1.3.4.tar.xz
|
||||
/pkgconf-1.3.5.tar.xz
|
||||
/pkgconf-1.3.6.tar.xz
|
||||
/pkgconf-1.3.7.tar.xz
|
||||
/pkgconf-1.3.8.tar.xz
|
||||
/pkgconf-1.3.9.tar.xz
|
||||
/pkgconf-1.3.10.tar.xz
|
||||
/pkgconf-1.3.12.tar.xz
|
||||
/pkgconf-1.3.90.tar.xz
|
||||
/pkgconf-1.4.0.tar.xz
|
||||
/pkgconf-1.4.1.tar.xz
|
||||
/pkgconf-1.4.2.tar.xz
|
||||
/pkgconf-1.5.1.tar.xz
|
||||
/pkgconf-1.5.3.tar.xz
|
||||
/pkgconf-1.5.4.tar.xz
|
||||
/pkgconf-1.6.0.tar.xz
|
||||
/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
|
||||
|
||||
@ -1 +0,0 @@
|
||||
28caf985acabb06fe48eb89c4b2a8c5342ca4859 SOURCES/pkgconf-1.4.2.tar.xz
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
8
pkg-config.in
Normal file
8
pkg-config.in
Normal file
@ -0,0 +1,8 @@
|
||||
#!/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" "$@"
|
||||
@ -12,20 +12,31 @@
|
||||
%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
|
||||
|
||||
# libpkgconf soversion major version
|
||||
%global libsomajor 4
|
||||
|
||||
Name: pkgconf
|
||||
Version: 1.4.2
|
||||
Release: 1%{?dist}
|
||||
Version: 2.1.0
|
||||
Release: 3%{?dist}
|
||||
Summary: Package compiler and linker metadata toolkit
|
||||
|
||||
License: ISC
|
||||
URL: http://pkgconf.org/
|
||||
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
|
||||
@ -35,9 +46,11 @@ BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
|
||||
%if %{with tests}
|
||||
# For unit tests
|
||||
BuildRequires: %{_bindir}/kyua
|
||||
BuildRequires: kyua
|
||||
BuildRequires: atf-tests
|
||||
%endif
|
||||
|
||||
# pkgconf uses libpkgconf internally
|
||||
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||
@ -100,6 +113,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
|
||||
@ -115,7 +136,9 @@ autoreconf -fiv
|
||||
|
||||
|
||||
%check
|
||||
make check
|
||||
%if %{with tests}
|
||||
make check || :
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
@ -123,19 +146,33 @@ 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 <<EOM
|
||||
%%pkgconfig_personalitydir %{_datadir}/pkgconfig/personality.d
|
||||
EOM
|
||||
|
||||
%if %{with pkgconfig_compat}
|
||||
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
|
||||
|
||||
ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
|
||||
install -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/pkg-config
|
||||
|
||||
# I don't have a better way to deal with this...
|
||||
cp -a %{buildroot}%{_mandir}/man1/pkgconf.1 %{buildroot}%{_mandir}/man1/pkg-config.1
|
||||
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
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}%{_datadir}/pkgconfig
|
||||
@ -155,10 +192,15 @@ rm -rf %{buildroot}%{_datadir}/aclocal
|
||||
%{_bindir}/%{name}
|
||||
%{_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
|
||||
%{_libdir}/lib%{name}*.so.*
|
||||
%{_libdir}/lib%{name}*.so.%{libsomajor}{,.*}
|
||||
|
||||
%files -n lib%{name}-devel
|
||||
%{_libdir}/lib%{name}*.so
|
||||
@ -178,7 +220,140 @@ rm -rf %{buildroot}%{_datadir}/aclocal
|
||||
%dir %{_datadir}/pkgconfig
|
||||
%endif
|
||||
|
||||
%files -n bomtool
|
||||
%{_bindir}/bomtool
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.1.0-3
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.0-2
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* 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
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jul 14 13:23:30 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.3-1
|
||||
- Update to 1.6.3
|
||||
|
||||
* Fri Jul 12 09:36:57 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.2-1
|
||||
- Update to 1.6.2
|
||||
|
||||
* Mon Mar 25 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.1-1
|
||||
- Update to 1.6.1
|
||||
|
||||
* Sat Feb 09 2019 Neal Gompa <ngompa13@gmail.com> - 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 <releng@fedoraproject.org> - 1.5.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Nov 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5.4-1
|
||||
- Update to 1.5.4
|
||||
|
||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.5.3-2
|
||||
- Rebuild with fixed binutils
|
||||
|
||||
* Sun Jul 29 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5.3-1
|
||||
- Update to 1.5.3
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Jun 29 2018 Neal Gompa <ngompa13@gmail.com> - 1.5.1-2
|
||||
- Add patch to fix system path override issue
|
||||
|
||||
* Wed Jun 27 2018 Neal Gompa <ngompa13@gmail.com> - 1.5.1-1
|
||||
- Upgrade to 1.5.1
|
||||
|
||||
* Sat Mar 31 2018 Neal Gompa <ngompa13@gmail.com> - 1.4.2-1
|
||||
- Update to 1.4.2
|
||||
- Drop conditionals for old Fedora releases
|
||||
@ -1,12 +1,14 @@
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
# 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@}"
|
||||
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_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 "$@"
|
||||
Loading…
Reference in New Issue
Block a user