From 235fe8890c0e5bf4b9198c7d6e003146e719d144 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Thu, 11 Feb 2021 11:20:58 +1100
Subject: [PATCH] Resolve minor errors in the spec file

---
 pcp.spec | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pcp.spec b/pcp.spec
index 09edf55..f46b8c6 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 5.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -197,12 +197,12 @@ Conflicts: librapi < 0.16
 
 # KVM PMDA moved into pcp (no longer using Perl, default on)
 Obsoletes: pcp-pmda-kvm < 4.1.1
-Provides: pcp-pmda-kvm
+Provides: pcp-pmda-kvm = %{version}-%{release}
 
 # PCP REST APIs are now provided by pmproxy
 Obsoletes: pcp-webapi-debuginfo < 5.0.0
 Obsoletes: pcp-webapi < 5.0.0
-Provides: pcp-webapi
+Provides: pcp-webapi = %{version}-%{release}
 
 # PCP discovery service now provided by pmfind
 Obsoletes: pcp-manager-debuginfo < 5.2.0
@@ -2315,7 +2315,7 @@ PCP_CONF=$BACKDIR/src/include/pcp.conf
 export PCP_CONF
 . $BACKDIR/src/include/pcp.env
 CFGFILELIST=`ls -1 $BACKDIR/debian/pcp-conf.{install,dirs}`
-LIBFILELIST=`ls -1 $BACKDIR/debian/lib*.{install,dirs} | fgrep -v -- -dev.`
+LIBFILELIST=`ls -1 $BACKDIR/debian/lib*.{install,dirs} | grep -F -v -- -dev.`
 DEVFILELIST=`ls -1 $BACKDIR/debian/lib*-dev.{install,dirs}`
 
 # Package split: pcp{-conf,-libs,-libs-devel,-testsuite,-import-*,-export-*}...
@@ -2351,10 +2351,10 @@ sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-devel-files
 
 # some special cases for devel
 awk '{print $NF}' $DIST_MANIFEST |\
-egrep 'pcp\/(examples|demos)|(etc/pcp|pcp/pmdas)\/(sample|simple|trivial|txmon)|bin/(pmdbg|pmclient|pmerr|genpmda)' | egrep -v tutorials >>pcp-devel-files
+grep -E 'pcp\/(examples|demos)|(etc/pcp|pcp/pmdas)\/(sample|simple|trivial|txmon)|bin/(pmdbg|pmclient|pmerr|genpmda)' | grep -E -v tutorials >>pcp-devel-files
 
-# Patterns for files to be marked %config(noreplace).
-# Note: /etc/pcp.{conf,env,sh} are %config but not noreplace
+# Patterns for files to be marked %%config(noreplace).
+# Note: /etc/pcp.{conf,env,sh} are %%config but not noreplace
 # and are treated specially below.
 cat >confpath.list <<EOF
 etc/sysconfig/
@@ -2365,10 +2365,10 @@ EOF
 # functions to manipulate the manifest of files - keeping
 # or culling given (or common) patterns from the stream.
 keep() {
-    egrep $@ || return 0
+    grep -E $@ || return 0
 }
 cull() {
-    egrep -v $@ || return 0
+    grep -E -v $@ || return 0
 }
 total_manifest() {
     awk '{print $NF}' $DIST_MANIFEST
@@ -2388,7 +2388,7 @@ total_manifest | keep 'testsuite|etc/systemd/system' >pcp-testsuite-files
 basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
 basic_manifest | keep 'selinux' | cull 'tmp|GNUselinuxdefs' >pcp-selinux-files
 basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' >pcp-zeroconf-files
-basic_manifest | egrep -e 'pmiostat|pmrep|dstat|pcp2csv' \
+basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' \
    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free|pcp-htop' \
    -e 'pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \
    -e 'pcp-numastat|pcp-pidstat|pcp-shping|pcp-tapestat' \
@@ -3273,7 +3273,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %files import-iostat2pcp -f pcp-import-iostat2pcp-files.rpm
 
 #TODO:
-#%files import-sheet2pcp -f pcp-import-sheet2pcp-files.rpm
+#%%files import-sheet2pcp -f pcp-import-sheet2pcp-files.rpm
 
 %files import-mrtg2pcp -f pcp-import-mrtg2pcp-files.rpm
 
@@ -3306,11 +3306,8 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 
 %files zeroconf -f pcp-zeroconf-files.rpm
 
-
-
 %changelog
-=======
-* Wed Feb 10 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-1
+* Wed Feb 10 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-2
 - Update to latest PCP sources.
 - Fix pcp-dstat(1) sample count being off-by-one (BZ 1922768)
 - Add dstat(1) symlink to pcp-dstat(1) in pcp-doc (BZ 1922771)