From 0fcdfe65ddf227f8b0ed7ac871529209ecb3bc55 Mon Sep 17 00:00:00 2001
From: Mark Goodwin <mgoodwin@redhat.com>
Date: Wed, 26 Dec 2018 16:20:43 +1100
Subject: [PATCH] patch to revert pmlogger_daily daystart patch (BZ 1662034)

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

diff --git a/.gitignore b/.gitignore
index 6e1b4c5..0bcae83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pcp-*.tar.gz
 pcp-webapp-*.tar.gz
 pcp-webjs-*
 vector-*
+/pcp-revert-pmlogger_daily-daystart.patch
diff --git a/pcp.spec b/pcp.spec
index 0679072..0dff8d9 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL:     https://pcp.io
@@ -14,6 +14,8 @@ Source1: %{github}/pcp-webapp-vector/archive/1.3.1-1/pcp-webapp-vector-1.3.1-1.t
 Source2: %{github}/pcp-webapp-grafana/archive/1.9.1-2/pcp-webapp-grafana-1.9.1-2.tar.gz
 Source3: %{github}/pcp-webapp-graphite/archive/0.9.10/pcp-webapp-graphite-0.9.10.tar.gz
 Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.1/pcp-webapp-blinkenlights-1.0.1.tar.gz
+# patch for GH#597
+Patch0: pcp-revert-pmlogger_daily-daystart.patch
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
 %global __python2 python2
@@ -2223,6 +2225,7 @@ updated policy package.
 %setup -q -T -D -a 3 -c -n graphite
 %setup -q -T -D -a 4 -c -n blinkenlights
 %setup -q
+%patch0 -p1
 
 %build
 %if !%{disable_python2} && 0%{?default_python} != 3
@@ -3410,6 +3413,9 @@ cd
 %endif
 
 %changelog
+* Wed Dec 26 2018 Mark Goodwin <mgoodwin@redhat.com> - 4.3.0-2
+- Revert pmlogger_daily daystart patch (BZ 1662034)
+
 * Fri Dec 21 2018 Nathan Scott <nathans@redhat.com> - 4.3.0-1
 - Add the dstat -f/--full option to expand instances (BZ 1651536)
 - Improve systemd interaction for local pmie (BZ 1650999)
diff --git a/sources b/sources
index 4675ee0..5ebacd2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,6 @@
 SHA512 (pcp-4.3.0.src.tar.gz) = 9dd6e3aeb05e1e90408365b87dc850a6ddd6576b5697d9c61c8d4316503397daa38198ceec92ca83f4e0b3a668c43c0c50f710b6919782d63b6e7b8cdcf33f3b
 SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762572ddc9a5c7c66fd085adcabb70f9e7a9b2c9b6095a8fb358f6a6c64dbf41cf245e2da74a60b8120880f314b6ed3d271c
-SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
-SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
 SHA512 (pcp-webapp-vector-1.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289
+SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
+SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
+SHA512 (pcp-revert-pmlogger_daily-daystart.patch) = b12febf6b7df9a79a225f5aff858b2ef755428349d86181f98da5986c479ab4375ffaa55af3dd749725341e4026fa26d54287f1668f19acbe59ff1c97e16967c