From 76cd77d64a820fa93b46437570974c2e1de3927b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 9 Apr 2016 03:04:09 +0000 Subject: [PATCH] scst.spec.in: Leave out 'r' from revision number RPM version comparison works correctly with numbers but not if the revision starts with 'r'. Hence leave out the 'r'. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6855 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e5092d915..104403592 100644 --- a/Makefile +++ b/Makefile @@ -55,9 +55,9 @@ EMULEX_DIR=emulex ISCSI_DIR=iscsi-scst REVISION ?= $(shell if svn info >/dev/null 2>&1; \ - then svn info | sed -n 's/^Revision:[[:blank:]]*/r/p';\ - else echo -n r; git log | grep -c ^commit; \ - fi) + then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\ + else git log | grep -c ^commit; \ + fi) VERSION = $(shell echo -n "$$(sed -n 's/^\#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^-]*\).*\"/\1/p' scst/include/scst_const.h).$(REVISION)") help: