From a4c9e81ff23b833baa5754cce79de442c4c8149d Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 10 Aug 2015 08:57:42 -0400
Subject: [PATCH 1/6] Automated weekly pcp rawhide release:
 0.20150810gitad91613

---
 .gitignore |  1 +
 pcp.spec   | 17 +++++++++++------
 sources    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b69cdd5..672fdf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.4.src.tar.gz
 /pcp-3.10.5.src.tar.gz
 /pcp-3.10.6.src.tar.gz
+/pcp-3.10.7-0.20150810gitad91613.tar.gz
diff --git a/pcp.spec b/pcp.spec
index d5d6c24..aa82d25 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,13 +1,13 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
-Version: 3.10.6
-%global buildversion 1
+Version: 3.10.7
+%global buildversion 0
 
-Release: %{buildversion}%{?dist}
+Release: 0.20150810gitad91613%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: pcp-%{version}.src.tar.gz
+Source0: %{name}-%{version}-0.20150810gitad91613.tar.gz
 Source1: pcp-webjs.src.tar.gz
 
 # Compat check for distros that already have single install pmda's
@@ -87,13 +87,13 @@ Source1: pcp-webjs.src.tar.gz
 
 # systemtap static probing, missing before el6 and on some architectures
 %if 0%{?rhel} == 0 || 0%{?rhel} > 5
+%global disable_sdt 0
+%else
 %ifnarch ppc ppc64
 %global disable_sdt 0
 %else
 %global disable_sdt 1
 %endif
-%else
-%global disable_sdt 1
 %endif
 
 # rpm producing "noarch" packages
@@ -186,6 +186,7 @@ Obsoletes: pcp-gui-debuginfo
 %global _initddir %{_datadir}/pcp/lib
 %else
 %global _initddir %{_sysconfdir}/rc.d/init.d
+%global _with_initd --with-rcdir=%{_initddir}
 %endif
 
 # we never want Infiniband on s390 platforms
@@ -2331,6 +2332,10 @@ cd
 %endif
 
 %changelog
+* Mon Aug 10 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150810gitad91613
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Tue Aug 04 2015 Nathan Scott <nathans@redhat.com> - 3.10.6-1
 - Fix pcp2graphite write method invocation failure (BZ 1243123)
 - Reduce diagnostics in pmdaproc unknown state case (BZ 1224431)
diff --git a/sources b/sources
index 6ca8cee..89c14dd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5282d9183a57a813da58b38f9bb76067  pcp-3.10.6.src.tar.gz
+9d63efe779fe0c07d00dd237c2a400a5  pcp-3.10.7-0.20150810gitad91613.tar.gz
 628bb0764c2ee9647a79ed50136ed12f  pcp-webjs.src.tar.gz

From aee4d81e00484a64191aee46f5b66d2ab5029c57 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Tue, 18 Aug 2015 08:50:21 -0400
Subject: [PATCH 2/6] Automated weekly pcp rawhide release:
 0.20150818git063cfd3

---
 .gitignore |  1 +
 pcp.spec   | 31 +++++++++++++++++++++++++++----
 sources    |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 672fdf8..a03756a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.5.src.tar.gz
 /pcp-3.10.6.src.tar.gz
 /pcp-3.10.7-0.20150810gitad91613.tar.gz
+/pcp-3.10.7-0.20150818git063cfd3.tar.gz
diff --git a/pcp.spec b/pcp.spec
index aa82d25..ea321a7 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,11 +3,11 @@ Name: pcp
 Version: 3.10.7
 %global buildversion 0
 
-Release: 0.20150810gitad91613%{?dist}
+Release: 0.20150818git063cfd3%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: %{name}-%{version}-0.20150810gitad91613.tar.gz
+Source0: %{name}-%{version}-0.20150818git063cfd3.tar.gz
 Source1: pcp-webjs.src.tar.gz
 
 # Compat check for distros that already have single install pmda's
@@ -1073,6 +1073,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics about the Unbound DNS Resolver.
 # end pcp-pmda-unbound
 
+#
+# pcp-pmda-mic
+#
+%package pmda-mic
+License: GPLv2+
+Group: Applications/System
+Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards
+URL: http://www.pcp.io
+%if !%{disable_python3}
+Requires: python3-pcp
+%else
+Requires: python-pcp
+%endif
+%description pmda-mic
+This package contains the PCP Performance Metrics Domain Agent (PMDA) for
+collecting metrics about Intel MIC cards.
+# end pcp-pmda-mic
+
 %endif # !%{disable_python2} || !%{disable_python3}
 
 %if !%{disable_json}
@@ -1382,7 +1400,7 @@ Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda
 Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-logger
 Requires: pcp-pmda-lustrecomm
 %if !%{disable_python2} || !%{disable_python3}
-Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound
+Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
 Requires: pcp-system-tools pcp-export-pcp2graphite
 %endif
 %if !%{disable_json}
@@ -1415,7 +1433,7 @@ Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda
 Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping
 Requires: pcp-pmda-lustrecomm pcp-pmda-logger
 %if !%{disable_python2} || !%{disable_python3}
-Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound
+Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
 %endif
 %if !%{disable_json}
 Requires: pcp-pmda-json
@@ -1666,6 +1684,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
   grep -E -v '^weblog' |\
   grep -E -v '^rpm' |\
   grep -E -v '^json' |\
+  grep -E -v '^mic' |\
   grep -E -v '^gluster' |\
   grep -E -v '^zswap' |\
   grep -E -v '^unbound' |\
@@ -2332,6 +2351,10 @@ cd
 %endif
 
 %changelog
+* Tue Aug 18 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150818git063cfd3
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Aug 10 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150810gitad91613
 - Automated weekly rawhide release
 - Applied spec changes from upstream git
diff --git a/sources b/sources
index 89c14dd..56f486a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9d63efe779fe0c07d00dd237c2a400a5  pcp-3.10.7-0.20150810gitad91613.tar.gz
+f08d7bdaac0e7cbd4d7759ef3866dcc1  pcp-3.10.7-0.20150818git063cfd3.tar.gz
 628bb0764c2ee9647a79ed50136ed12f  pcp-webjs.src.tar.gz

From e61bd2698efc602af03245ce044f8a9c2843a39a Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Tue, 18 Aug 2015 09:18:07 -0400
Subject: [PATCH 3/6] Add pmda-mic files to specfile for 0.20150818git063cfd3

---
 pcp.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pcp.spec b/pcp.spec
index ea321a7..041d2b0 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -2252,6 +2252,9 @@ cd
 
 %files export-pcp2graphite
 %{_bindir}/pcp2graphite
+
+%files pmda-mic
+%{_pmdasdir}/mic
 %endif # !%{disable_python2} || !%{disable_python3}
 
 %if !%{disable_json}
@@ -2354,6 +2357,7 @@ cd
 * Tue Aug 18 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150818git063cfd3
 - Automated weekly rawhide release
 - Applied spec changes from upstream git
+- Packaged pmda-mic bits in spec file
 
 * Mon Aug 10 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150810gitad91613
 - Automated weekly rawhide release

From 04fb9dec814216f3a0f0f6d3acec4048daee0825 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 24 Aug 2015 08:35:09 -0400
Subject: [PATCH 4/6] Automated weekly pcp rawhide release:
 0.20150824gita4f06ab

---
 .gitignore | 1 +
 pcp.spec   | 7 +++++--
 sources    | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a03756a..ba1877f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.6.src.tar.gz
 /pcp-3.10.7-0.20150810gitad91613.tar.gz
 /pcp-3.10.7-0.20150818git063cfd3.tar.gz
+/pcp-3.10.7-0.20150824gita4f06ab.tar.gz
diff --git a/pcp.spec b/pcp.spec
index 041d2b0..4b9b69f 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,11 +3,11 @@ Name: pcp
 Version: 3.10.7
 %global buildversion 0
 
-Release: 0.20150818git063cfd3%{?dist}
+Release: 0.20150824gita4f06ab%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: %{name}-%{version}-0.20150818git063cfd3.tar.gz
+Source0: %{name}-%{version}-0.20150824gita4f06ab.tar.gz
 Source1: pcp-webjs.src.tar.gz
 
 # Compat check for distros that already have single install pmda's
@@ -2354,6 +2354,9 @@ cd
 %endif
 
 %changelog
+* Mon Aug 24 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150824gita4f06ab
+- Automated weekly rawhide release
+
 * Tue Aug 18 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150818git063cfd3
 - Automated weekly rawhide release
 - Applied spec changes from upstream git
diff --git a/sources b/sources
index 56f486a..5792c28 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f08d7bdaac0e7cbd4d7759ef3866dcc1  pcp-3.10.7-0.20150818git063cfd3.tar.gz
-628bb0764c2ee9647a79ed50136ed12f  pcp-webjs.src.tar.gz
+78d872eb4ba197d45394b2fa02a7e925  pcp-3.10.7-0.20150824gita4f06ab.tar.gz
+dc8f25e48371121a24c84eb6f7ec5646  pcp-webjs.src.tar.gz

From cdb89dedbda84a385bbbd658823dc10cd88a8215 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 31 Aug 2015 09:39:26 -0400
Subject: [PATCH 5/6] Automated weekly pcp rawhide release:
 0.20150831gita27cca8

---
 .gitignore |  1 +
 pcp.spec   | 19 +++++++++++++++----
 sources    |  4 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba1877f..4e8524e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.7-0.20150810gitad91613.tar.gz
 /pcp-3.10.7-0.20150818git063cfd3.tar.gz
 /pcp-3.10.7-0.20150824gita4f06ab.tar.gz
+/pcp-3.10.7-0.20150831gita27cca8.tar.gz
diff --git a/pcp.spec b/pcp.spec
index 4b9b69f..36eb4db 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,11 +3,11 @@ Name: pcp
 Version: 3.10.7
 %global buildversion 0
 
-Release: 0.20150824gita4f06ab%{?dist}
+Release: 0.20150831gita27cca8%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: %{name}-%{version}-0.20150824gita4f06ab.tar.gz
+Source0: %{name}-%{version}-0.20150831gita27cca8.tar.gz
 Source1: pcp-webjs.src.tar.gz
 
 # Compat check for distros that already have single install pmda's
@@ -1774,7 +1774,7 @@ save_configs_script()
         [ "$_dir" = "$_new" ] && continue
         if [ -d "$_dir" ]
         then
-            ( cd "$_dir" ; find . -type f -print ) | sed -e 's/^\.\///' \
+            ( cd "$_dir" ; find . -maxdepth 1 -type f ) | sed -e 's/^\.\///' \
             | while read _file
             do
                 [ "$_file" = "control" ] && continue
@@ -1802,7 +1802,7 @@ done
 for daemon in pmcd pmproxy
 do
     save_configs_script >> "$PCP_LOG_DIR/configs.sh" "$PCP_SYSCONF_DIR/$daemon"\
-        "$PCP_CONFIG_DIR/$daemon" /etc/$daemon /etc/sysconfig/$daemon
+        "$PCP_CONFIG_DIR/$daemon" /etc/$daemon
 done
 exit 0
 
@@ -2004,6 +2004,9 @@ cd
 %config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
+%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
+%config(noreplace) %{_sysconfdir}/sysconfig/pmproxy
+%config(noreplace) %{_sysconfdir}/sysconfig/pmcd
 %config %{_sysconfdir}/bash_completion.d/pcp
 %config %{_sysconfdir}/pcp.env
 %config %{_sysconfdir}/pcp.sh
@@ -2014,9 +2017,13 @@ cd
 %dir %{_confdir}/pmproxy
 %config(noreplace) %{_confdir}/pmproxy/pmproxy.options
 %dir %{_confdir}/pmie
+%dir %{_confdir}/pmie/control.d
 %config(noreplace) %{_confdir}/pmie/control
+%config(noreplace) %{_confdir}/pmie/control.d/local
 %dir %{_confdir}/pmlogger
+%dir %{_confdir}/pmlogger/control.d
 %config(noreplace) %{_confdir}/pmlogger/control
+%config(noreplace) %{_confdir}/pmlogger/control.d/local
 
 %{_localstatedir}/lib/pcp/config/pmafm
 %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie
@@ -2354,6 +2361,10 @@ cd
 %endif
 
 %changelog
+* Mon Aug 31 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150831gita27cca8
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Aug 24 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150824gita4f06ab
 - Automated weekly rawhide release
 
diff --git a/sources b/sources
index 5792c28..da7f957 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-78d872eb4ba197d45394b2fa02a7e925  pcp-3.10.7-0.20150824gita4f06ab.tar.gz
-dc8f25e48371121a24c84eb6f7ec5646  pcp-webjs.src.tar.gz
+d987a3c31bbf8591b812c03ad86f6781  pcp-3.10.7-0.20150831gita27cca8.tar.gz
+4e5092c397d511b8fa15e5c766a9f68e  pcp-webjs.src.tar.gz

From 363b5df8d3d879957435bedff02225a304feb279 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 14 Sep 2015 09:16:00 -0400
Subject: [PATCH 6/6] Automated weekly pcp rawhide release:
 0.20150914git857b343

---
 .gitignore |  1 +
 pcp.spec   | 14 ++++++++++++--
 sources    |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e8524e..468c18f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.7-0.20150818git063cfd3.tar.gz
 /pcp-3.10.7-0.20150824gita4f06ab.tar.gz
 /pcp-3.10.7-0.20150831gita27cca8.tar.gz
+/pcp-3.10.7-0.20150914git857b343.tar.gz
diff --git a/pcp.spec b/pcp.spec
index 36eb4db..05b49f1 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,11 +3,11 @@ Name: pcp
 Version: 3.10.7
 %global buildversion 0
 
-Release: 0.20150831gita27cca8%{?dist}
+Release: 0.20150914git857b343%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: %{name}-%{version}-0.20150831gita27cca8.tar.gz
+Source0: %{name}-%{version}-0.20150914git857b343.tar.gz
 Source1: pcp-webjs.src.tar.gz
 
 # Compat check for distros that already have single install pmda's
@@ -688,6 +688,7 @@ Group: Applications/System
 Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch
 URL: http://www.pcp.io
 Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl(LWP::UserAgent)
 
 %description pmda-elasticsearch
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -794,6 +795,8 @@ Group: Applications/System
 Summary: Performance Co-Pilot (PCP) metrics for MySQL
 URL: http://www.pcp.io
 Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl(DBI)
+Requires: perl(DBD::mysql)
 
 %description pmda-mysql
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -853,6 +856,7 @@ Group: Applications/System
 Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver
 URL: http://www.pcp.io
 Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl(LWP::UserAgent)
 
 %description pmda-nginx
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -922,6 +926,8 @@ Group: Applications/System
 Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL
 URL: http://www.pcp.io
 Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl(DBI)
+Requires: perl(DBD::Pg)
 
 %description pmda-postgresql
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -2361,6 +2367,10 @@ cd
 %endif
 
 %changelog
+* Mon Sep 14 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150914git857b343
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Aug 31 2015 Lukas Berk <lberk@redhat.com> - 3.10.7-0.20150831gita27cca8
 - Automated weekly rawhide release
 - Applied spec changes from upstream git
diff --git a/sources b/sources
index da7f957..12ff796 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d987a3c31bbf8591b812c03ad86f6781  pcp-3.10.7-0.20150831gita27cca8.tar.gz
+f9533648fa76937b86128dc772498cb9  pcp-3.10.7-0.20150914git857b343.tar.gz
 4e5092c397d511b8fa15e5c766a9f68e  pcp-webjs.src.tar.gz