rpm: another enhancements for the final versions

diff --git a/rpm/Makefile b/rpm/Makefile
index aa3b25a73bf7c24cc3c22116f38eee1c889eff45..1d5a8f14e72c3d6e85ffccd3efe6eaecbe30b122 100644 (file)
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -27,22 +27,33 @@ VERSION  ?= "0.0.0"
 RELEASE  ?= 1
 ifeq ($(VERSION),$(RELEASE))
 RELEASE   = 1
-COMMIT1   = $(COMMIT)
+REF       = $(COMMIT)
+COMMITR   = $(shell echo $(COMMIT) | sed "s/^v//")
+else
+REF       = $(COMMIT1)
+COMMITR   = $(COMMIT1)
 endif
 
 tvheadend.spec: tvheadend.spec.in
        @sed -e 's/@VERSION@/$(VERSION)/g' \
             -e 's/@RELEASE@/$(RELEASE)/g' \
-            -e 's/@COMMIT@/$(COMMIT1)/g' \
+            -e 's/@REF@/$(REF)/g' \
+            -e 's/@COMMIT@/$(COMMITR)/g' \
                $< > $@
 
 ~/rpmbuild/SOURCES:
        mkdir -p $(foreach f,BUILD RPMS SOURCES SPECS SRPMS,~/rpmbuild/$(f))
 
+.PHONY: srpm
 srpm: ~/rpmbuild/SOURCES tvheadend.spec
        spectool --get-files --sourcedir tvheadend.spec
        rpmbuild -bs tvheadend.spec
 
+.PHONY: build
 build: ~/rpmbuild/SOURCES tvheadend.spec
        spectool --get-files --sourcedir tvheadend.spec
        rpmbuild -ba tvheadend.spec
+
+.PHONY: clean.
+clean:
+       rm -f tvheadend.spec

diff --git a/rpm/tvheadend.spec.in b/rpm/tvheadend.spec.in
index 043d9c1543216267bb70c4fac188903697950a78..19a8c8d4a7accb9c1f3c030d5f61cb89b00eb524 100644 (file)
--- a/rpm/tvheadend.spec.in
+++ b/rpm/tvheadend.spec.in
@@ -1,3 +1,4 @@
+%global ref @REF@
 %global commit @COMMIT@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
@@ -10,7 +11,7 @@ License:        GPLv3
 Group:          Applications/Multimedia
 URL:            http://tvheadend.org
 
-Source:         https://github.com/tvheadend/tvheadend/archive/%{commit}/tvheadend-%{commit}.tar.gz
+Source:         https://github.com/tvheadend/tvheadend/archive/%{ref}/tvheadend-%{commit}.tar.gz
 #Patch999:      test.patch
 
 BuildRequires:  systemd-units >= 1
@@ -83,6 +84,7 @@ exit 0
 %changelog
 * Mon May 25 2015 Jaroslav Kysela <perex@perex.cz> v4.0.2
 - fix requires (libs) and improve description
+- add support for final version to Source
 
 * Thu May 21 2015 Jaroslav Kysela <perex@perex.cz> v4.0.1
 - changed versioning system (put changes and git hash to revision)