[python-carbon/f18] Update to 0.9.12

[Jonathan Steffan]

commit 11226cdf85e61c7ec6633977343abe40b964d483
Author: Jonathan Steffan <jsteffan at fedoraproject.org>
Date:   Mon Sep 2 15:16:40 2013 -0600

    Update to 0.9.12

 .gitignore                        |    1 +
 python-carbon-0.9.10-fedora.patch |   79 -------------------------------------
 python-carbon-0.9.12-fedora.patch |   66 +++++++++++++++++++++++++++++++
 python-carbon.spec                |   19 +++++++--
 sources                           |    2 +-
 5 files changed, 82 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7220ff6..ba428f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /carbon-0.9.10.tar.gz
+/python-carbon-0.9.12.tar.gz
diff --git a/python-carbon-0.9.12-fedora.patch b/python-carbon-0.9.12-fedora.patch
new file mode 100644
index 0000000..efe81a3
--- /dev/null
+++ b/python-carbon-0.9.12-fedora.patch
@@ -0,0 +1,66 @@
+diff -up carbon-0.9.12/conf/carbon.conf.example.orig carbon-0.9.12/conf/carbon.conf.example
+--- carbon-0.9.12/conf/carbon.conf.example.orig	2013-09-02 13:57:02.988052455 -0600
++++ carbon-0.9.12/conf/carbon.conf.example	2013-09-02 13:57:41.755754856 -0600
+@@ -30,13 +30,21 @@
+ #
+ #LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
+ 
++STORAGE_DIR    = /var/lib/carbon/
++LOCAL_DATA_DIR = /var/lib/carbon/whisper/
++WHITELISTS_DIR = /var/lib/carbon/lists/
++CONF_DIR       = /etc/carbon/
++LOG_DIR        = /var/log/carbon/
++PID_DIR        = /var/run/
++
+ # Enable daily log rotation. If disabled, a kill -HUP can be used after a manual rotate
+ ENABLE_LOGROTATION = True
+ 
+ # Specify the user to drop privileges to
+ # If this is blank carbon runs as the user that invokes it
+ # This user must have write access to the local data directory
+-USER =
++USER = carbon
++
+ #
+ # NOTE: The above settings must be set under [relay] and [aggregator]
+ #       to take effect for those daemons as well
+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
+@@ -1,9 +1,9 @@
+-[install]
+-prefix = /opt/graphite
+-install-lib = %(prefix)s/lib
++#[install]
++#prefix = /opt/graphite
++#install-lib = %(prefix)s/lib
+ 
+-[bdist_rpm]
+-requires = python-twisted
+-           whisper
++#[bdist_rpm]
++#requires = python-twisted
++#           whisper
+ 
+-post-install = distro/redhat/misc/postinstall
++#post-install = distro/redhat/misc/postinstall
+diff -up carbon-0.9.12/setup.py.orig carbon-0.9.12/setup.py
+--- carbon-0.9.12/setup.py.orig	2013-09-02 13:53:41.269486210 -0600
++++ carbon-0.9.12/setup.py	2013-09-02 13:55:57.968875350 -0600
+@@ -13,11 +13,12 @@ else:
+   setup_kwargs = dict()
+ 
+ 
+-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
+-                 ('storage/log',[]), ('storage/rrd',[]) ]
+-conf_files = [ ('conf', glob('conf/*.example')) ]
++#storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
++#                 ('storage/log',[]), ('storage/rrd',[]) ]
++#conf_files = [ ('conf', glob('conf/*.example')) ]
+ 
+-install_files = storage_dirs + conf_files
++#install_files = storage_dirs + conf_files
++install_files = []
+ 
+ # If we are building on RedHat, let's use the redhat init scripts.
+ if platform.dist()[0] == 'redhat':
diff --git a/python-carbon.spec b/python-carbon.spec
index 98c2bfb..69dfbec 100644
--- a/python-carbon.spec
+++ b/python-carbon.spec
@@ -1,19 +1,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           python-carbon
-Version:        0.9.10
-Release:        2%{?dist}
+Version:        0.9.12
+Release:        1%{?dist}
 Summary:        Back-end data caching and persistence daemon for Graphite
 Group:          System Environment/Daemons
 
 License:        ASL 2.0
 URL:            https://launchpad.net/graphite/
-Source0:        https://github.com/downloads/graphite-project/carbon/carbon-0.9.10.tar.gz
+Source0:        https://github.com/graphite-project/carbon/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}-cache.init
 Source2:        %{name}-relay.init
 Source3:        %{name}-aggregator.init
 Source4:        %{name}.sysconfig
-Patch0:         python-carbon-0.9.10-fedora.patch
+Patch0:         python-carbon-0.9.12-fedora.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -119,9 +119,18 @@ fi
 
 
 %changelog
+* Mon Sep 02 2013 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.12-1
+- Update to 0.9.12
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Sat Nov 24 2012 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.10-2
 - Update spec to build on el5
 - Fix python_sitelib definition
 
-* Thu May 30 2012 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.10-1
+* Wed May 30 2012 Jonathan Steffan <jsteffan at fedoraproject.org> - 0.9.10-1
 - Initial Package
diff --git a/sources b/sources
index 5b91871..e8587f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-053b2df1c928250f59518e9bb9f35ad5  carbon-0.9.10.tar.gz
+674c7376be70b07a90eecf013dad6600  python-carbon-0.9.12.tar.gz