From 87447579c8c8c2656b1d3d8e2f5bde971768de55 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sat, 21 Jan 2017 18:10:36 -0500
Subject: [PATCH] Upgrade to 1.2.0 Enable pkgconf-pkg-config and pkgconf-m4 for
 F26+

---
 pkgconf.spec | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/pkgconf.spec b/pkgconf.spec
index 5e16dba..0999c3c 100644
--- a/pkgconf.spec
+++ b/pkgconf.spec
@@ -1,13 +1,20 @@
-# pkgconf can optionally act as pkgconfig as well
+# pkgconf can acts as pkgconfig for F26+
+%if 0%{?fedora} >= 26
+%bcond_without pkgconfig_compat
+%else
 %bcond_with pkgconfig_compat
+%endif
 
 %if %{with pkgconfig_compat}
 %global pkgconfig_ver 0.29.1
+# For obsoleting pkgconfig
+%global pkgconfig_verrel %{pkgconfig_ver}-2
+%global pkgconfig_evr 1:%{pkgconfig_verrel}
 %endif
 
 Name:           pkgconf
-Version:        1.1.1
-Release:        3%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Package compiler and linker metadata toolkit
 
 License:        ISC
@@ -57,7 +64,9 @@ Summary:        m4 macros for pkgconf
 License:        GPLv2+ with exceptions
 BuildArch:      noarch
 # FIXME: Somehow get rid of the file conflict between pkgconfig and pkgconf-m4
-Conflicts:      pkgconfig < 1:%{pkgconfig_ver}.1
+Conflicts:      pkgconfig < %{pkgconfig_evr}
+# Ensure that it Obsoletes pkgconfig since it contains content formerly from it
+Obsoletes:      pkgconfig < %{pkgconfig_evr}
 
 %description m4
 This package includes m4 macros used to support PKG_CHECK_MODULES
@@ -66,24 +75,23 @@ when using pkgconf with autotools.
 %package pkg-config
 Summary:        %{name} shim to provide /usr/bin/pkg-config
 # Ensure that it Conflicts with pkgconfig and is considered "better"
-Conflicts:      pkgconfig < 1:%{pkgconfig_ver}.1
-Provides:       pkgconfig = 1:%{pkgconfig_ver}.1
-Provides:       pkgconfig%{?_isa} = 1:%{pkgconfig_ver}.1
+Conflicts:      pkgconfig < %{pkgconfig_evr}
+Obsoletes:      pkgconfig < %{pkgconfig_evr}
+Provides:       pkgconfig = %{pkgconfig_evr}
+Provides:       pkgconfig%{?_isa} = %{pkgconfig_evr}
 # This is in the original pkgconfig package, set to match output from pkgconf
 Provides:       pkgconfig(pkg-config) = %{version}
 # Generic pkg-config Provides for those who might use alternate package name
-Provides:       pkg-config = %{pkgconfig_ver}.1
-Provides:       pkg-config%{?_isa} = %{pkgconfig_ver}.1
+Provides:       pkg-config = %{pkgconfig_verrel}
+Provides:       pkg-config%{?_isa} = %{pkgconfig_verrel}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-m4 = %{version}-%{release}
 
 %description pkg-config
 This package provides the shim links for pkgconf to be automatically
-used in place of pkgconfig.
+used in place of pkgconfig. This ensures that pkgconf is used as
+the system provider of pkg-config.
 
-This is useful when bootstrapping new architectures where you wish
-to avoid the circular dependency with glib2 and pkgconfig when
-building from source.
 %endif
 
 
@@ -158,6 +166,10 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 %endif
 
 %changelog
+* Sat Jan 21 2017 Neal Gompa <ngompa13@gmail.com> - 1.2.0-1
+- Upgrade to 1.2.0
+- Enable pkgconf-pkg-config and pkgconf-m4 for F26+
+
 * Sat Jan 14 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.1-3
 - Add missing pkgconfig() Provides for virtual .pc files defined in pkgconf