Add missing Epoch to pkgconfig Provides/Conflicts for pkgconf-pkg-config

Add copy of pkgconf.1 as pkg-config.1 in pkgconf-pkg-config

pkgconf.spec

@@ -7,7 +7,7 @@
 
 Name:           pkgconf
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Package compiler and linker metadata toolkit
 
 License:        ISC
@@ -54,7 +54,7 @@ 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 < %{pkgconfig_ver}.1
+Conflicts:      pkgconfig < 1:%{pkgconfig_ver}.1
 
 %description m4
 This package includes m4 macros used to support PKG_CHECK_MODULES
@@ -62,10 +62,11 @@ when using pkgconf with autotools.
 
 %package pkg-config
 Summary:        %{name} shim to provide /usr/bin/pkg-config
-# Ensure that it Conflicts with pkg-config and is considered "better"
-Conflicts:      pkgconfig < %{pkgconfig_ver}.1
-Provides:       pkgconfig = %{pkgconfig_ver}.1
-Provides:       pkgconfig%{?_isa} = %{pkgconfig_ver}.1
+# 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
+# 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
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -106,6 +107,10 @@ find %{buildroot} -name '*.la' -print -delete
 %if %{with pkgconfig_compat}
 ln -sf pkgconf %{buildroot}%{_bindir}/pkg-config
 ln -sf pkgconf %{buildroot}%{_bindir}/%{_target_platform}-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
+
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
 mkdir -p %{buildroot}%{_datadir}/pkgconfig
 %endif
@@ -142,11 +147,16 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 %files pkg-config
 %{_bindir}/pkg-config
 %{_bindir}/%{_target_platform}-pkg-config
+%{_mandir}/man1/pkg-config.1.*
 %dir %{_libdir}/pkgconfig
 %dir %{_datadir}/pkgconfig
 %endif
 
 %changelog
+* Fri Jan 13 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.1-2
+- Add missing Epoch to pkgconfig Provides/Conflicts for pkgconf-pkg-config
+- Add copy of pkgconf.1 as pkg-config.1 in pkgconf-pkg-config
+
 * Sat Jan 07 2017 Neal Gompa <ngompa13@gmail.com> - 1.1.1-1
 - Upgrade to 1.1.1
 - Add missing directories to pkgconf-pkg-config