From 9b3385c1e86b2479a93d9be18efe686caf422f2557c12d89b584fe4c5b869291 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 15 Jul 2019 00:07:11 +0000 Subject: [PATCH 1/2] - Set pkgconf to provide pkgconfig on Tumbleweed (post SUSE Linux 15) OBS-URL: https://build.opensuse.org/package/show/devel:tools/pkgconf?expand=0&rev=10 --- pkgconf.changes | 5 +++++ pkgconf.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgconf.changes b/pkgconf.changes index 74b1597..1dc898a 100644 --- a/pkgconf.changes +++ b/pkgconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..0ff81f0 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 From 43e844c2e168decfb5206af1c67fcb098ec1ae3ba6a9dd3bf849732d16413129 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 15 Jul 2019 00:29:04 +0000 Subject: [PATCH 2/2] - Fix license tag for pkgconf-m4 OBS-URL: https://build.opensuse.org/package/show/devel:tools/pkgconf?expand=0&rev=11 --- pkgconf.changes | 5 +++++ pkgconf.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgconf.changes b/pkgconf.changes index 1dc898a..c7b5af1 100644 --- a/pkgconf.changes +++ b/pkgconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/pkgconf.spec b/pkgconf.spec index 0ff81f0..034f044 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -96,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