[python-carbon/f20: 26/29] Revert "Update default runtime user to carbon for carbon-aggregator and carbon-relay (RHBZ#1013813)"

[Jamie Nguyen]

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

    Revert "Update default runtime user to carbon for carbon-aggregator and carbon-relay (RHBZ#1013813)"
    
    This reverts commit 6d89eeb68f79240fb2417d686fa92d1125127630.

 python-carbon-0.9.12-fedora.patch |   16 ----------------
 python-carbon.spec                |    6 +-----
 2 files changed, 1 insertions(+), 21 deletions(-)
---
diff --git a/python-carbon-0.9.12-fedora.patch b/python-carbon-0.9.12-fedora.patch
index 9b5d8a4..efe81a3 100644
--- a/python-carbon-0.9.12-fedora.patch
+++ b/python-carbon-0.9.12-fedora.patch
@@ -24,22 +24,6 @@ diff -up carbon-0.9.12/conf/carbon.conf.example.orig carbon-0.9.12/conf/carbon.c
  #
  # NOTE: The above settings must be set under [relay] and [aggregator]
  #       to take effect for those daemons as well
-@@ -215,6 +223,7 @@
- 
- 
- [relay]
-+USER = carbon
- LINE_RECEIVER_INTERFACE = 0.0.0.0
- LINE_RECEIVER_PORT = 2013
- PICKLE_RECEIVER_INTERFACE = 0.0.0.0
-@@ -285,6 +294,7 @@
- 
- 
- [aggregator]
-+USER = carbon
- LINE_RECEIVER_INTERFACE = 0.0.0.0
- LINE_RECEIVER_PORT = 2023
- 
 diff -up carbon-0.9.12/setup.cfg.orig carbon-0.9.12/setup.cfg
 --- carbon-0.9.12/setup.cfg.orig	2013-09-02 13:56:12.924145403 -0600
 +++ carbon-0.9.12/setup.cfg	2013-09-02 13:56:38.233603950 -0600
diff --git a/python-carbon.spec b/python-carbon.spec
index da6e189..ddc98db 100644
--- a/python-carbon.spec
+++ b/python-carbon.spec
@@ -2,7 +2,7 @@
 
 Name:           python-carbon
 Version:        0.9.12
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        Back-end data caching and persistence daemon for Graphite
 Group:          System Environment/Daemons
 
@@ -112,10 +112,6 @@ fi
 
 
 %changelog
-* Mon Sep 30 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.12-3
-- Update default runtime user to carbon for carbon-aggregator and
-  carbon-relay (RHBZ#1013813)
-
 * 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)