summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Messmer <gordon@dragonsdawn.net>2015-09-14 10:41:28 -0700
committerGordon Messmer <gordon@dragonsdawn.net>2015-09-14 10:41:28 -0700
commit815259a57104f23d98f705b7c82c7581adc2ff7e (patch)
tree6366fda96af951f6344562cd222745fc99c61567
parent1e1f7af9d6a6e5bbb7ec45c32d20cb85f9e83e8e (diff)
downloadbcfg2-815259a57104f23d98f705b7c82c7581adc2ff7e.tar.gz
bcfg2-815259a57104f23d98f705b7c82c7581adc2ff7e.tar.bz2
bcfg2-815259a57104f23d98f705b7c82c7581adc2ff7e.zip
The export script will set _rc to "rc<number", and likewise for
_pre. Update the Release macro to work correctly in that case, and reset both _rc and _pre to a commented-out state.
-rw-r--r--misc/bcfg2.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 88031d6a5..4b6da2441 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -18,11 +18,11 @@
# characters from the appropriate line below.
#
# Don't forget to change the Release: tag below to something like 0.1
-%global _rc 1
-#%%global _pre 1
+#%%global _rc rc1
+#%%global _pre pre1
%global _nightly 1
%global _date %(date +%Y%m%d)
-%global _pre_rc %{?_pre:pre%{_pre}}%{?_rc:rc%{_rc}}
+%global _pre_rc %{?_pre:%{_pre}}%{?_rc:%{_rc}}
# cherrypy 3.3 actually doesn't exist yet, but 3.2 has bugs that
# prevent it from working: