Accepting request 715356 from devel:tools

- Set pkgconf to provide pkgconfig on Tumbleweed (post SUSE Linux 15)
- Fix license tag for pkgconf-m4

OBS-URL: https://build.opensuse.org/request/show/715356
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pkgconf?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2019-07-16 06:41:19 +00:00 committed by Git OBS Bridge
commit e84a8fdb4f
2 changed files with 16 additions and 2 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jul 15 00:28:33 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
- Fix license tag for pkgconf-m4
-------------------------------------------------------------------
Mon Jul 15 00:04:56 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
- Set pkgconf to provide pkgconfig on Tumbleweed (post SUSE Linux 15)
-------------------------------------------------------------------
Wed May 1 12:32:54 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

View File

@ -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