[graphite-web] Remove logrotate configuration as it conflicts with internal log rotation (RHBZ#1008616)

Jonathan Steffan jsteffan at fedoraproject.org
Tue Oct 1 03:43:35 UTC 2013


commit bb54d81db35989818451d0bd6e01e9073bc1605b
Author: Jonathan Steffan <jsteffan at fedoraproject.org>
Date:   Mon Sep 30 21:43:18 2013 -0600

    Remove logrotate configuration as it conflicts with internal log rotation (RHBZ#1008616)

 graphite-web-logrotate.fedora |    8 --------
 graphite-web.spec             |   14 +++++++-------
 2 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/graphite-web.spec b/graphite-web.spec
index 516b5f3..711cad0 100644
--- a/graphite-web.spec
+++ b/graphite-web.spec
@@ -1,6 +1,6 @@
 Name:           graphite-web
 Version:        0.9.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Django webapp for enterprise scalable realtime graphing
 
 License:        ASL 2.0
@@ -8,8 +8,7 @@ URL:            https://launchpad.net/graphite/
 Source0:        https://github.com/graphite-project/graphite-web/archive/0.9.12.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        graphite-web-vhost.conf
 Source2:        graphite-web-README.fedora
-Source3:        graphite-web-logrotate.fedora
-Source4:        graphite-web-README.selinux
+Source3:        graphite-web-README.selinux
 Patch0:         graphite-web-0.9.12-fhs-thirdparty.patch
 BuildRoot:      %{_tmppath}/graphite-web-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,7 +63,7 @@ SELinux labeling for graphite files.
 # Remove thridparty libs
 %patch0 -p1
 %{__install} -m 644 %{SOURCE2} README.fedora
-%{__install} -m 644 %{SOURCE4} README.selinux
+%{__install} -m 644 %{SOURCE3} README.selinux
 
 
 %build
@@ -78,7 +77,6 @@ rm -rf %{buildroot}
 # Create directories 
 %{__mkdir_p} %{buildroot}%{_localstatedir}/lib/graphite-web
 %{__mkdir_p} %{buildroot}%{_localstatedir}/log/graphite-web
-%{__mkdir_p} %{buildroot}%{_localstatedir}/logrotate.d
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/graphite-web
 
 # Install some default configurations and wsgi
@@ -86,7 +84,6 @@ rm -rf %{buildroot}
 %{__install} -Dp -m0644 webapp/graphite/local_settings.py.example %{buildroot}%{_sysconfdir}/graphite-web/local_settings.py
 %{__install} -Dp -m0644 conf/graphite.wsgi.example %{buildroot}%{_datarootdir}/graphite/graphite-web.wsgi
 %{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/graphite-web.conf
-%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/graphite-web
 
 # Configure django /media/ location
 sed -i 's|##PYTHON_SITELIB##|%{python_sitelib}|' %{buildroot}%{_sysconfdir}/httpd/conf.d/graphite-web.conf
@@ -126,7 +123,6 @@ fi
 %doc README.fedora LICENSE conf/* examples/*
 %{python_sitelib}/graphite*
 %{_datarootdir}/graphite
-%config(noreplace) %{_sysconfdir}/logrotate.d/graphite-web
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/graphite-web.conf
 %config(noreplace) %{_sysconfdir}/graphite-web/local_settings.py
 %ghost %{_sysconfdir}/graphite-web/local_settings.pyc
@@ -139,6 +135,10 @@ fi
 %doc README.selinux
 
 %changelog
+* Mon Sep 30 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.12-4
+- Remove logrotate configuration as it conflicts with internal
+  log rotation (RHBZ#1008616)
+
 * Tue Sep 24 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.12-3
 - Reorder Requires conditionals to fix amzn1 issues (RHBZ#1007300)
 - Ensure python-whisper is also updated


More information about the scm-commits mailing list