[condor] Add ability to set a git revision in the release if doing a git-based build.

Brian Bockelman bbockelm at fedoraproject.org
Fri Jun 24 03:49:00 UTC 2011


commit c50f72f0a0ba0db7919894232b09d0c6abf6e95f
Author: Brian Bockelman <bbockelm at cse.unl.edu>
Date:   Thu Jun 23 21:42:02 2011 -0500

    Add ability to set a git revision in the release if doing a git-based build.

 condor.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/condor.spec b/condor.spec
index ae49a61..ffc721c 100644
--- a/condor.spec
+++ b/condor.spec
@@ -23,6 +23,9 @@
 # These flags are meant for developers; it allows one to build Condor
 # based upon a git-derived tarball, instead of an upstream release tarball
 %define git_build 0
+# If building with git tarball, Fedora requests us to record the rev.  Use:
+# git log -1 --pretty=format:'%h'
+%define git_rev 8b70570
 %define git_build_man 0
 
 # Determine whether man pages will be included.
@@ -35,7 +38,16 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.7.0
-Release: 0.5%{?dist}
+
+# Only edit the %condor_base_release to bump the rev number
+%define condor_base_release 0.5
+%if %git_build
+%define condor_release %condor_base_release.%{git_rev}git
+%else
+%define condor_release %condor_base_release
+%endif
+Release: %condor_release%{?dist}
+
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/


More information about the scm-commits mailing list