[python-carbon] Patch setup.py to prevent installation of init scripts
Jamie Nguyen
jamielinux at fedoraproject.org
Mon Nov 24 19:34:29 UTC 2014
commit f8899e7e13412d6b68dc0d00fffc6ed987e4cf4a
Author: Jamie Nguyen <j at jamielinux.com>
Date: Mon Nov 24 19:29:49 2014 +0000
Patch setup.py to prevent installation of init scripts
python-carbon.spec | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/python-carbon.spec b/python-carbon.spec
index 51009b9..5457b5c 100644
--- a/python-carbon.spec
+++ b/python-carbon.spec
@@ -18,7 +18,7 @@
Name: python-carbon
Version: 0.9.12
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Back-end data caching and persistence daemon for Graphite
Group: System Environment/Daemons
@@ -42,8 +42,9 @@ Source41: %{name}-relay.init
Source42: %{name}-aggregator.init
Source43: %{name}.sysconfig
-Patch0: %{name}-0.9.12-Set-sane-defaults.patch
-Patch1: %{name}-0.9.12-Fix-path-to-storage-schemas.conf.patch
+Patch0: %{name}-0.9.12-Do-not-install-upstream-init-scripts.patch
+Patch1: %{name}-0.9.12-Set-sane-defaults.patch
+Patch2: %{name}-0.9.12-Fix-path-to-storage-schemas.conf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -74,12 +75,15 @@ a storage back-end.
%prep
%setup -q -n carbon-%{commit}
-# Set sane default filesystem paths.
+# Install our own init scripts
%patch0 -p1
-# Fix path to storage-schemas.conf.
+# Set sane default filesystem paths.
%patch1 -p1
+# Fix path to storage-schemas.conf.
+%patch2 -p1
+
%if %{with_system_logrotate}
# Disable internal log rotation.
sed -i -e 's/ENABLE_LOGROTATION.*/ENABLE_LOGROTATION = False/g' \
@@ -247,6 +251,9 @@ fi
%changelog
+* Mon Nov 24 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.9.12-7
+- patch setup.py to prevent installation of upstream init scripts
+
* Fri Nov 14 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.9.12-6
- conditionally define macros for EPEL 6 and below
More information about the scm-commits
mailing list