[python-carbon/f18] Add strict python-whisper Requires (RHBZ#1010432), Don't cleanup user and user data on package remov

Jonathan Steffan jsteffan at fedoraproject.org
Tue Sep 24 16:39:28 UTC 2013


commit ba6d172e1201863b8d231ecf4db2e4d95ab71ddb
Author: Jonathan Steffan <jsteffan at fedoraproject.org>
Date:   Tue Sep 24 10:39:13 2013 -0600

    Add strict python-whisper Requires (RHBZ#1010432), Don't cleanup user and user data on package remove (RHBZ#1010430)

 python-carbon.spec |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/python-carbon.spec b/python-carbon.spec
index 69dfbec..ddc98db 100644
--- a/python-carbon.spec
+++ b/python-carbon.spec
@@ -2,7 +2,7 @@
 
 Name:           python-carbon
 Version:        0.9.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-end data caching and persistence daemon for Graphite
 Group:          System Environment/Daemons
 
@@ -19,7 +19,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel, python-setuptools
-Requires:       python-whisper, python-twisted-core >= 8.0
+Requires:       python-whisper >= %{version}, python-twisted-core >= 8.0
 Requires(post): chkconfig
 Requires(pre):  shadow-utils
 Requires(preun): chkconfig, initscripts
@@ -95,13 +95,6 @@ fi
 /sbin/chkconfig --add carbon-aggregator
 
 
-%postun
-if [ $1 = 0 ]; then
-  getent passwd carbon >/dev/null && \
-      userdel -r carbon 2>/dev/null
-fi
-
-
 %files
 %doc LICENSE conf/*
 %dir %{_sysconfdir}/carbon
@@ -119,6 +112,10 @@ fi
 
 
 %changelog
+* Tue Sep 24 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.12-2
+- Add strict python-whisper Requires (RHBZ#1010432)
+- Don't cleanup user and user data on package remove (RHBZ#1010430)
+
 * Mon Sep 02 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.12-1
 - Update to 0.9.12
 


More information about the scm-commits mailing list