diff --git a/pkgconf.changes b/pkgconf.changes index 74b1597..c7b5af1 100644 --- a/pkgconf.changes +++ b/pkgconf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 15 00:28:33 UTC 2019 - Neal Gompa + +- Fix license tag for pkgconf-m4 + +------------------------------------------------------------------- +Mon Jul 15 00:04:56 UTC 2019 - Neal Gompa + +- Set pkgconf to provide pkgconfig on Tumbleweed (post SUSE Linux 15) + ------------------------------------------------------------------- Wed May 1 12:32:54 UTC 2019 - Neal Gompa diff --git a/pkgconf.spec b/pkgconf.spec index 155d558..034f044 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -21,8 +21,12 @@ %{!?make_build: %global make_build %{__make} %{?_smp_mflags}} %{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d} -# pkgconf does not act as pkgconfig by default +# pkgconf acts as pkgconfig for Tumbleweed (post SUSE Linux 15) +%if 0%{?suse_version} >= 1550 +%bcond_without pkgconfig_compat +%else %bcond_with pkgconfig_compat +%endif %if %{with pkgconfig_compat} %global pkgconfig_ver 0.29.2 @@ -92,7 +96,7 @@ to use functionality provided by %{name}. %if %{with pkgconfig_compat} %package m4 Summary: m4 macros for pkgconf -License: GPL-2.0+ with Autoconf-exception-2.0 +License: GPL-2.0-or-later WITH Autoconf-exception-2.0 Group: Development/Libraries/Other BuildArch: noarch # Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it