[Lsb-messages] /var/www/bzr/lsb/devel/distribution-checker r80: Use bug 3599 package versioning in dist-checker.

[Jeff Licquia]

------------------------------------------------------------
revno: 80
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: distribution-checker
timestamp: Wed 2013-05-15 22:09:18 -0400
message:
  Use bug 3599 package versioning in dist-checker.
modified:
  package/Makefile
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-26 18:35:35 +0000
+++ b/package/Makefile	2013-05-16 02:09:18 +0000
@@ -1,7 +1,7 @@
 BRANCH?=lsb
 PACKAGE=$(BRANCH)-dist-checker
 # export PACKAGE=moblin-dist-checker to make Moblin Distribution Checker package.
-VERSION_LSB=4.1.0.12
+VERSION_LSB=4.1.0.13
 VERSION_MOBLIN=2.0.1.9
 ifeq "$(BRANCH)" "moblin"
 	VERSION=$(VERSION_MOBLIN)
@@ -25,7 +25,7 @@
 ISO_DATE=$(shell date +"%Y%m%d")
 PWD=$(shell pwd)
 
-FULL_PACKAGE_NAME=$(PACKAGE)-$(VERSION)$(VERSION_SUFFIX)
+FULL_PACKAGE_NAME=$(PACKAGE)-$(VERSION)
 TARBALL=$(FULL_PACKAGE_NAME).src.tgz
 
 RPM_BINARY_NAME=$(FULL_PACKAGE_NAME)-$(RELEASE).$(RPM_BUILD_ARCH).rpm
@@ -34,12 +34,11 @@
 # Handle different version generation for snapshots than for official builds
 # OFFICIAL_RELEASE should be set to the tag to extract from BZR
 ifdef OFFICIAL_RELEASE
-	VERSION_SUFFIX=
 	# EXPORT_TAG should be set to the bzr revisionspec to use
 	EXPORT_TAG=--revision=$(OFFICIAL_RELEASE)
 else
-	VERSION_SUFFIX=.0.$(ISO_DATE)
 	EXPORT_TAG=
+	RELEASE=0.$(ISO_DATE)
 endif
 
 # Determine whether to use rpm or rpmbuild to build the packages
@@ -78,7 +77,7 @@
 
 # Specfile generation rule
 %.spec : %.spec.sed
-	sed -e "s#@NAME@#$(PACKAGE)#" -e "s#@VERSION@#$(VERSION)$(VERSION_SUFFIX)#" -e "s#@RELEASE@#$(RELEASE)#" < $< > $@
+	sed -e "s#@NAME@#$(PACKAGE)#" -e "s#@VERSION@#$(VERSION)#" -e "s#@RELEASE@#$(RELEASE)#" < $< > $@
 
 deb_package: rpm_package
 	@if [ ! `which fakeroot` ]; then \