Accepting request 699874 from devel:tools

- Update to 1.6.1
  + Fixed an issue where a personality may not be properly selected
    due to argv[0] containing a full path.
  + Fixed a regression where having an empty PKG_CONFIG_LIBDIR
    environment variable would not eliminate the default search
    paths.
  + Use POSIX realpath(3) instead of readlink() for deduplicating the
    search path.  Use _fullpath() on Windows for the same purpose.
  + The dequoting logic for tuples has been improved to ensure that
    quotes *inside* a value remain quoted when necessary.
  + Fixed issue where packages which referenced missing packages in
    Requires.private may have crashed due to memory corruption issues
    in some circumstances.
  + Fixed warnings reported by GCC 8 diagnostics.
  + Add LIBPKGCONF_VERSION and LIBPKGCONF_VERSION_STR macros for
    determining libpkgconf version.
  + Add pkgconf_fragment_copy_list() to copy a fragment list to
    another fragment list.
  + Fix edge cases for path canonicalization (especially on Windows)
- Add personality.d directories for cross-targets
- Add pkgconf rpm macros for pkgconf directories
- Simplify platform-pkg-config wrapper to work with POSIX sh

OBS-URL: https://build.opensuse.org/request/show/699874
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pkgconf?expand=0&rev=4

pkgconf-1.5.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715
-size 290240

pkgconf-1.6.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22b9ee38438901f9d60f180e5182821180854fa738fd071f593ea26a81da208c
+size 291028

pkgconf.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed May  1 12:32:54 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
+
+- Update to 1.6.1
+  + Fixed an issue where a personality may not be properly selected
+    due to argv[0] containing a full path.
+  + Fixed a regression where having an empty PKG_CONFIG_LIBDIR
+    environment variable would not eliminate the default search
+    paths.
+  + Use POSIX realpath(3) instead of readlink() for deduplicating the
+    search path.  Use _fullpath() on Windows for the same purpose.
+  + The dequoting logic for tuples has been improved to ensure that
+    quotes *inside* a value remain quoted when necessary.
+  + Fixed issue where packages which referenced missing packages in
+    Requires.private may have crashed due to memory corruption issues
+    in some circumstances.
+  + Fixed warnings reported by GCC 8 diagnostics.
+  + Add LIBPKGCONF_VERSION and LIBPKGCONF_VERSION_STR macros for
+    determining libpkgconf version.
+  + Add pkgconf_fragment_copy_list() to copy a fragment list to
+    another fragment list.
+  + Fix edge cases for path canonicalization (especially on Windows)
+- Add personality.d directories for cross-targets
+- Add pkgconf rpm macros for pkgconf directories
+- Simplify platform-pkg-config wrapper to work with POSIX sh
+
 -------------------------------------------------------------------
 Tue Aug 21 12:27:05 UTC 2018 - Neal Gompa <ngompa13@gmail.com>
 

pkgconf.spec

@@ -2,7 +2,7 @@
 # spec file for package pkgconf
 #
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2018 Neal Gompa <ngompa13@gmail.com>.
+# Copyright (c) 2019 Neal Gompa <ngompa13@gmail.com>.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,12 +13,13 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 # Compatibility macros
 %{!?make_build: %global make_build %{__make} %{?_smp_mflags}}
+%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d}
 
 # pkgconf does not act as pkgconfig by default
 %bcond_with pkgconfig_compat
@@ -37,7 +38,7 @@
 %global devname lib%{name}-devel
 
 Name:           pkgconf
-Version:        1.5.3
+Version:        1.6.1
 Release:        0
 Summary:        Package compiler and linker metadata toolkit
 License:        ISC
@@ -143,6 +144,16 @@ autoreconf -fiv
 
 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
+
 # Purge autotools-created docdir, as we'll docify with the SUSE-specific documentation paths later
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
@@ -157,8 +168,8 @@ sed -e "s|@TARGET_PLATFORM@|%{_target_platform}|" \
 
 ln -sf pkgconf %{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
+# 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
@@ -181,6 +192,10 @@ rm -rf %{buildroot}%{_mandir}/man7
 %{_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 %{libname}
 %license COPYING

platform-pkg-config.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Simple wrapper to tell pkgconf to behave as a platform-specific version of pkg-config
 # Platform: @TARGET_PLATFORM@
@@ -7,6 +7,4 @@ 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@}"
 
-pkgconf $@
-
-exit $?
+exec pkgconf "$@"