Release version 4.1.0

- Clean up epochs and more in Makefile

Author: borntyping

Makefile

@@ -4,26 +4,39 @@ vendor="Sam Clements <sam.clements@datasift.com>"
 
 define fpm
 	@mkdir -p dist
-	fpm -s python -t rpm --package $@ --vendor ${vendor} --epoch 1
+	fpm -s python -t rpm --package $@ --vendor ${vendor} --epoch 0
 endef
 
 
 default:
 	@echo "Usage:"
 	@echo "  make riemann-client - build generic riemann-client RPM"
-	@echo "  make el6 - build CentOS 6 riemann-client RPM"
+	@echo "  make el6 - build CentOS 6 riemann-client and protobuf RPM"
 	@echo "  make el5 - build CentOS 5 riemann-client and protobuf RPM"
 
 
 version=$(shell python setup.py --version)
-release=4
+release=6
 
 riemann-client: dist/python-riemann-client-${version}-${release}.noarch.rpm
 
 dist/python-riemann-client-${version}-${release}.noarch.rpm:
 	${fpm} --iteration ${release} --version ${version} setup.py
 
 
+el6: riemann-client.el6
+
+riemann-client.el6: dist/python-riemann-client-${version}-${release}.el6.noarch.rpm
+
+dist/python-riemann-client-${version}-${release}.el6.noarch.rpm:
+	${fpm} --iteration ${release}.el6 --version ${version} \
+	--python-bin python2.6 \
+	--no-python-dependencies \
+	--depends 'python-argparse >= 1.1' \
+	--depends 'python-protobuf >= ${protobuf_version}-${protobuf_release}.el6' \
+	setup.py
+
+
 el5: riemann-client.el5 protobuf.el5
 
 riemann-client.el5: dist/python26-riemann-client-${version}-${release}.el5.noarch.rpm
@@ -32,43 +45,45 @@ dist/python26-riemann-client-${version}-${release}.el5.noarch.rpm:
 	${fpm} --version ${version} --iteration ${release}.el5 \
 	--python-bin python2.6 \
 	--python-package-name-prefix python26 \
+	--no-python-dependencies \
+	--depends 'python26-argparse >= 1.1' \
+	--depends 'python26-protobuf >= ${protobuf_version}-${protobuf_release}.el5' \
 	setup.py
 
+
+
 protobuf_version=2.5.0
-protobuf_release=3
-protobuf_source=https://pypi.python.org/packages/source/p/protobuf/protobuf-${protobuf_version}.tar.gz
+protobuf_release=4
+protobuf_source=build/protobuf-${protobuf_version}
+
+protobuf.el5: dist/python-protobuf-${protobuf_version}-${protobuf_release}.el6.noarch.rpm
+
+dist/python-protobuf-${protobuf_version}-${protobuf_release}.el6.noarch.rpm: ${protobuf_source}
+	${fpm} --version ${protobuf_version} --iteration ${protobuf_release}.el6 \
+	--python-bin python2.6 \
+	--conflicts 'protobuf-python' \
+	${protobuf_source}/setup.py
 
 protobuf.el5: dist/python26-protobuf-${protobuf_version}-${protobuf_release}.el5.noarch.rpm
 
-dist/python26-protobuf-${protobuf_version}-${protobuf_release}.el5.noarch.rpm: build/protobuf-${protobuf_version}
+dist/python26-protobuf-${protobuf_version}-${protobuf_release}.el5.noarch.rpm: ${protobuf_source}
 	${fpm} --version ${protobuf_version} --iteration ${protobuf_release}.el5 \
 	--python-package-name-prefix python26 \
 	--python-bin python2.6 \
-	build/protobuf-${protobuf_version}/setup.py
+	${protobuf_source}/setup.py
 
 # easy_install pulls the full protobuf package from an external site, this
 # fetches the exact package we want to use. This also fixes permissions for the
 # package metadata, since those seem to be broken (the egg-info directory is not
-# world readable, meaning that non-root users can't import the package). If
-# you're reading this and need to fix this, I'm very sorry.
+# world readable, meaning that non-root users can't import the package).
+
+protobuf_source_url=https://pypi.python.org/packages/source/p/protobuf/protobuf-${protobuf_version}.tar.gz
 
 build/protobuf-${protobuf_version}:
 	@mkdir -p build
-	curl -sq ${protobuf_source} | tar xz --directory build
+	curl -sq ${protobuf_source_url} | tar xz --directory build
 	chmod -R g+w,o+r build/protobuf-${protobuf_version}/protobuf.egg-info
 	@touch build/protobuf-${protobuf_version}
 
-el6: riemann-client.el6
-
-riemann-client.el6: dist/python-riemann-client-${version}-${release}.el6.noarch.rpm
-
-dist/python-riemann-client-${version}-${release}.el6.noarch.rpm:
-	${fpm} --iteration ${release}.el6 --version ${version} \
-	--python-bin python2.6 \
-	--no-python-dependencies \
-	--depends 'python-argparse >= 1.1' \
-	--depends 'protobuf-python >= 2.3.0' \
-	setup.py
-
 
 .PHONY: default riemann-client el5 riemann-client.el5 protobuf.el5 el6 riemann-client.el6

riemann_client/__init__.py

@@ -1,4 +1,4 @@
 """A Python Riemann client and command line tool"""
 
-__version__ = '4.1.0-dev'
+__version__ = '4.1.0'
 __author__ = 'Sam Clements <sam.clements@datasift.com>'

setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name='riemann-client',
-    version='4.1.0-dev',
+    version='4.1.0',
 
     author="Sam Clements",
     author_email="sam.clements@datasift.com",