[python-carbon/f20: 27/29] Revert "Add strict python-whisper Requires (RHBZ#1010432), Don't cleanup user and user data on packa

[Jamie Nguyen]

commit 6add13f415799af0551cf4ff6a241969a4c54ed7
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Nov 14 18:43:14 2014 +0000

    Revert "Add strict python-whisper Requires (RHBZ#1010432), Don't cleanup user and user data on package remove (RHBZ#1010430)"
    
    This reverts commit 5f6af86e099374c3c8e945ece09991de2311f862.

 python-carbon.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/python-carbon.spec b/python-carbon.spec
index ddc98db..69dfbec 100644
--- a/python-carbon.spec
+++ b/python-carbon.spec
@@ -2,7 +2,7 @@
 
 Name:           python-carbon
 Version:        0.9.12
-Release:        2%{?dist}
+Release:        1%{?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 >= %{version}, python-twisted-core >= 8.0
+Requires:       python-whisper, python-twisted-core >= 8.0
 Requires(post): chkconfig
 Requires(pre):  shadow-utils
 Requires(preun): chkconfig, initscripts
@@ -95,6 +95,13 @@ 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
@@ -112,10 +119,6 @@ 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