[PATCH v3 3/3] build: fix rpm versioning

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The current versioning scheme doesn't work properly:

  git-1.8.4 < git-1.8.4.rc1
  git-1.8.4 < git-1.8.4-rc1
  git-1.8.4 > git-1.8.4~rc1

Since v1.8.4 final is obviously greater than v1.8.4-rc1, we need to use
a tilde so RPM detects it properly as a greater version number.

This works in rpm-4.10, in older versions, a tilde would work as bad as
anything else.

Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3588ca1..7a8bee7 100644
--- a/Makefile
+++ b/Makefile
@@ -2426,7 +2426,7 @@ quick-install-html:
 ### Maintainer's dist rules
 
 git.spec: git.spec.in GIT-VERSION-FILE
-	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
+	sed -e 's/@@VERSION@@/$(subst -,~,$(GIT_VERSION))/g' < $< > $@+
 	mv $@+ $@
 
 GIT_TARNAME = git-$(GIT_VERSION)
-- 
1.8.4-fc

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]