[python-carbon] update to 0.9.13-pre1
Piotr Popieluch
piotrp at fedoraproject.org
Sat Mar 7 16:13:15 UTC 2015
commit b9b939a3251e58d43209bcd367fea4a0fefcadbf
Author: Piotr Popieluch <piotr1212 at gmail.com>
Date: Sat Mar 7 17:13:09 2015 +0100
update to 0.9.13-pre1
.gitignore | 1 +
...9.13-Do-not-install-upstream-init-scripts.patch | 2 +-
...n-0.9.13-Fix-path-to-storage-schemas.conf.patch | 0
...=> python-carbon-0.9.13-Set-sane-defaults.patch | 25 ++++++----------------
python-carbon.spec | 15 +++++++------
sources | 2 +-
6 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c080c4..d60a9b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/carbon-0.9.10.tar.gz
/python-carbon-0.9.12.tar.gz
/python-carbon-eac68f82c3a06fe66155fa7adf58b39649ef2d27.tar.gz
+/python-carbon-e69e1eb59aaade325d37e68d920d786f280d294a.tar.gz
diff --git a/python-carbon-0.9.12-Do-not-install-upstream-init-scripts.patch b/python-carbon-0.9.13-Do-not-install-upstream-init-scripts.patch
similarity index 97%
rename from python-carbon-0.9.12-Do-not-install-upstream-init-scripts.patch
rename to python-carbon-0.9.13-Do-not-install-upstream-init-scripts.patch
index 5d83c02..bedad0d 100644
--- a/python-carbon-0.9.12-Do-not-install-upstream-init-scripts.patch
+++ b/python-carbon-0.9.13-Do-not-install-upstream-init-scripts.patch
@@ -25,7 +25,7 @@ index 1f1f4ff..f9b9c35 100644
-
setup(
name='carbon',
- version='0.9.12',
+ version='0.9.13',
--
2.1.0
diff --git a/python-carbon-0.9.12-Fix-path-to-storage-schemas.conf.patch b/python-carbon-0.9.13-Fix-path-to-storage-schemas.conf.patch
similarity index 100%
rename from python-carbon-0.9.12-Fix-path-to-storage-schemas.conf.patch
rename to python-carbon-0.9.13-Fix-path-to-storage-schemas.conf.patch
diff --git a/python-carbon-0.9.12-Set-sane-defaults.patch b/python-carbon-0.9.13-Set-sane-defaults.patch
similarity index 52%
rename from python-carbon-0.9.12-Set-sane-defaults.patch
rename to python-carbon-0.9.13-Set-sane-defaults.patch
index 1e18c8f..eabfd40 100644
--- a/python-carbon-0.9.12-Set-sane-defaults.patch
+++ b/python-carbon-0.9.13-Set-sane-defaults.patch
@@ -1,17 +1,6 @@
-From 9440030edeb6f0f26c35dd2158ab5b679a169319 Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j at jamielinux.com>
-Date: Wed, 1 Oct 2014 10:58:45 +0100
-Subject: [PATCH 2/2] Set sane defaults
-
----
- conf/carbon.conf.example | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/conf/carbon.conf.example b/conf/carbon.conf.example
-index 94d9185..c5c88f2 100644
---- a/conf/carbon.conf.example
-+++ b/conf/carbon.conf.example
-@@ -30,13 +30,20 @@
+--- a/conf/carbon.conf.example 2015-01-19 17:15:34.400352274 +0100
++++ b/conf/carbon.conf.example 2015-01-19 17:16:02.100628514 +0100
+@@ -30,6 +30,13 @@
#
#LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
@@ -22,9 +11,10 @@ index 94d9185..c5c88f2 100644
+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 daily log rotation. If disabled, carbon will automatically re-open
+ # the file if it's rotated out of place (e.g. by logrotate daemon)
ENABLE_LOGROTATION = True
-
+@@ -37,7 +44,7 @@
# 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
@@ -33,6 +23,3 @@ index 94d9185..c5c88f2 100644
#
# NOTE: The above settings must be set under [relay] and [aggregator]
# to take effect for those daemons as well
---
-1.9.3
-
diff --git a/python-carbon.spec b/python-carbon.spec
index 5457b5c..63b73f4 100644
--- a/python-carbon.spec
+++ b/python-carbon.spec
@@ -4,7 +4,7 @@
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
-%global commit eac68f82c3a06fe66155fa7adf58b39649ef2d27
+%global commit e69e1eb59aaade325d37e68d920d786f280d294a
# Switched to system log rotation on Fedora 21 and EPEL 7.
# systemd service files introduced in Fedora 21 and EPEL 7.
@@ -17,8 +17,8 @@
%endif
Name: python-carbon
-Version: 0.9.12
-Release: 7%{?dist}
+Version: 0.9.13
+Release: 0.1.pre1%{?dist}
Summary: Back-end data caching and persistence daemon for Graphite
Group: System Environment/Daemons
@@ -42,9 +42,9 @@ Source41: %{name}-relay.init
Source42: %{name}-aggregator.init
Source43: %{name}.sysconfig
-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
+Patch0: %{name}-0.9.13-Do-not-install-upstream-init-scripts.patch
+Patch1: %{name}-0.9.13-Set-sane-defaults.patch
+Patch2: %{name}-0.9.13-Fix-path-to-storage-schemas.conf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -251,6 +251,9 @@ fi
%changelog
+* Mon Jan 19 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.9.13-0.1.pre1
+- update to 0.9.13-pre1
+
* Mon Nov 24 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.9.12-7
- patch setup.py to prevent installation of upstream init scripts
diff --git a/sources b/sources
index 2327583..8f9412a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d752faac67c79b991904cb6affc8290 python-carbon-eac68f82c3a06fe66155fa7adf58b39649ef2d27.tar.gz
+e98256b062c9f6e21f7d783c220c40fe python-carbon-e69e1eb59aaade325d37e68d920d786f280d294a.tar.gz
More information about the scm-commits
mailing list