]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Makefile: generate tagged RPMs with "-1" release value
authorKen Dreyer <kdreyer@redhat.com>
Tue, 7 Mar 2017 18:11:53 +0000 (11:11 -0700)
committerKen Dreyer <kdreyer@redhat.com>
Tue, 7 Mar 2017 18:11:53 +0000 (11:11 -0700)
Prior to this change, if we built an RPM from a tagged commit, the RPM
would have a release value of "0".

This causes some problems with RPM version comparisons when comparing
version numbers with "rc" tags/packages, which should also have a
less-than-one Release value.

Makefile

index 120be428d5aee22de5e20a5f4eda92fa5e0cf477..21461501997aba80274acfeb0ab70f2fdb31b61c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ RELEASE := $(shell git describe --tags --match 'v*' \
              | sed 's/^[^-]*-//' \
              | sed 's/-/./')
 ifeq ($(VERSION),$(RELEASE))
-  RELEASE = 0
+  RELEASE = 1
 endif
 NVR := $(NAME)-$(VERSION)-$(RELEASE).el7