set rpm release to is24, but when the profile 'teamcity' is activated

yadt · Oct 22, 2013 · 9dab9ce · 9dab9ce
1 parent d4b520e
commit 9dab9ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.py b/build.py
@@ -77,9 +77,12 @@ def set_properties(project):
     project.get_property('copy_resources_glob').append('setup.cfg')
     project.get_property('copy_resources_glob').append('docs/man/yadtshell.1.gz')
 
+    project.rpm_release = '0'
     project.install_file('share/man/man1/', 'docs/man/yadtshell.1.gz')
 
     project.get_property('filter_resources_glob').append('**/yadtshell/__init__.py')
+    project.get_property('filter_resources_glob').append('**/setup.cfg')
+
     project.set_property('dir_dist_scripts', 'scripts')
 
     project.get_property('distutils_commands').append('bdist_egg')
@@ -103,6 +106,7 @@ def set_properties_for_teamcity_builds(project):
     project.default_task = ['generate_manpages', 'install_build_dependencies', 'publish']
     project.set_property('install_dependencies_index_url', os.environ.get('PYPIPROXY_URL'))
     project.set_property('install_dependencies_use_mirrors', False)
+    project.rpm_release = 'is24'
 
 
 @task

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,4 @@
 [bdist_rpm]
 packager = Arne Hilmann <arne.hilmann@gmail.com>
 requires = python >= 2.6 PyYAML python-twisted >= 12 hostexpand yadtshell-config python-simplejson python-docopt
-release = 0%{?dist}
-
+release = ${rpm_release}