From d67c565d8422bb9d5c176ffa57ce5ed5ba9a7d0c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Jun 21 2017 17:46:56 +0000
Subject: Suppress logrotate output


---

diff --git a/1804.patch b/1804.patch
new file mode 100644
index 0000000..95fe1d2
--- /dev/null
+++ b/1804.patch
@@ -0,0 +1,23 @@
+From 6759cc1b1834eb6b50b6a3c583fc531d8452eaf0 Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion@cora.nwra.com>
+Date: Wed, 21 Jun 2017 11:41:45 -0600
+Subject: [PATCH] Suppress "edirecting to /bin/systemctl condrestart 
+ cobblerd.service" messages from logrotate on systemd systems
+
+---
+ config/cobblerd_rotate | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/cobblerd_rotate b/config/cobblerd_rotate
+index 2224f6600..17cb10e17 100644
+--- a/config/cobblerd_rotate
++++ b/config/cobblerd_rotate
+@@ -4,7 +4,7 @@
+    rotate 4
+    weekly
+    postrotate
+-      /sbin/service cobblerd condrestart > /dev/null
++      /sbin/service cobblerd condrestart > /dev/null 2>&1
+    endscript
+ }
+ 
diff --git a/cobbler.spec b/cobbler.spec
index e9d4a75..441a0c0 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -11,13 +11,15 @@
 
 Name:           cobbler
 Version:        2.8.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Boot server configurator
 URL:            http://cobbler.github.io/
 License:        GPLv2+
 Source0:        https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Upstream patch to fix module loading
 Patch0:         https://github.com/cobbler/cobbler/commit/0f5330c9cd9250450bb04b680aadc6e142fc19d1.patch
+# Suppress logrotate output
+Patch1:         https://patch-diff.githubusercontent.com/raw/cobbler/cobbler/pull/1804.patch
 
 BuildRequires: git
 BuildRequires: python2-devel
@@ -101,8 +103,7 @@ of an existing system.  For use with a boot-server configured with Cobbler
 
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
 %py2_build
@@ -247,6 +248,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Wed Jun 21 2017 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-3
+- Suppress logrotate output
+
 * Mon Jun 12 2017 Orion Poplawski <orion@cora.nwra.com> - 2.8.1-2
 - Fix module loading