[Lsb-messages] /var/www/bzr/lsb/devel/app-checker r47: Switch to snapshot version scheme from bug 3599.

[Jeff Licquia]

------------------------------------------------------------
revno: 47
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: app-checker
timestamp: Sun 2014-03-23 01:01:49 -0400
message:
  Switch to snapshot version scheme from bug 3599.
modified:
  package/Makefile
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-26 18:59:19 +0000
+++ b/package/Makefile	2014-03-23 05:01:49 +0000
@@ -18,11 +18,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)
+	RELEASE_LSB = 0.$(ISO_DATE)
+	RELEASE_MOBLIN = 0.$(ISO_DATE)
 	EXPORT_TAG = 
 endif
 
@@ -32,23 +32,23 @@
 	STD_VERSION = $(STD_VERSION_LSB)
 	SPEC_VERSION = $(SPEC_VERSION_LSB)
 	STD_NAME = LSB
-	SED_RULES = -e "s!@NAME@!$(PACKAGE)!" -e "s!@VERSION@!$(VERSION)$(VERSION_SUFFIX)!" -e "s!@RELEASE@!$(RELEASE)!" -e "s!@BRANCH@!$(BRANCH)!g" -e "s!@STD@!$(STD_NAME)!g" -e "s!@USER@!linuxappchecker!g" -e "s!@OSNAME@!Linux!g" -e "s!@URL@!http://www.linuxfoundation.org/collaborate/workgroups/lsb/download!g" -e "s!@REQUIRE@!Requires: lsb-setup, lsb-appchk, lsb-appchk-perl, lsb-appchk-python, lsb-appchk-shell, lsb-pkgchk!g" -e "s!@SHARE_DIR@!!g"
+	SED_RULES = -e "s!@NAME@!$(PACKAGE)!" -e "s!@VERSION@!$(VERSION)!" -e "s!@RELEASE@!$(RELEASE)!" -e "s!@BRANCH@!$(BRANCH)!g" -e "s!@STD@!$(STD_NAME)!g" -e "s!@USER@!linuxappchecker!g" -e "s!@OSNAME@!Linux!g" -e "s!@URL@!http://www.linuxfoundation.org/collaborate/workgroups/lsb/download!g" -e "s!@REQUIRE@!Requires: lsb-setup, lsb-appchk, lsb-appchk-perl, lsb-appchk-python, lsb-appchk-shell, lsb-pkgchk!g" -e "s!@SHARE_DIR@!!g"
 else
 	VERSION=$(VERSION_MOBLIN)
 	RELEASE = $(RELEASE_MOBLIN)
 	STD_VERSION = $(STD_VERSION_MOBLIN)
 	SPEC_VERSION = $(SPEC_VERSION_MOBLIN)
 	STD_NAME = Moblin
-	SED_RULES = -e "s!@NAME@!$(PACKAGE)!" -e "s!@VERSION@!$(VERSION)$(VERSION_SUFFIX)!" -e "s!@RELEASE@!$(RELEASE)!" -e "s!@BRANCH@!$(BRANCH)!g" -e "s!@STD@!$(STD_NAME)!g" -e "s!@USER@!moblinappchecker!g" -e "s!@OSNAME@!Moblin!g" -e "s!@URL@!http://moblin.org/documentation/moblin-sdk/coding-tutorials/moblin-compliance!g" -e "s!@REQUIRE@!!g" -e "s!@SHARE_DIR@!share!g"
+	SED_RULES = -e "s!@NAME@!$(PACKAGE)!" -e "s!@VERSION@!$(VERSION)!" -e "s!@RELEASE@!$(RELEASE)!" -e "s!@BRANCH@!$(BRANCH)!g" -e "s!@STD@!$(STD_NAME)!g" -e "s!@USER@!moblinappchecker!g" -e "s!@OSNAME@!Moblin!g" -e "s!@URL@!http://moblin.org/documentation/moblin-sdk/coding-tutorials/moblin-compliance!g" -e "s!@REQUIRE@!!g" -e "s!@SHARE_DIR@!share!g"
 endif
 
-FULL_PACKAGE_NAME = $(PACKAGE)-$(VERSION)$(VERSION_SUFFIX)
+FULL_PACKAGE_NAME = $(PACKAGE)-$(VERSION)
 DOC_DIR = /opt/$(BRANCH)/test/doc
 RPM_BINARY_NAME = $(FULL_PACKAGE_NAME)-$(RELEASE).$(RPM_BUILD_ARCH).rpm
 RPM_SOURCE_NAME = $(FULL_PACKAGE_NAME)-$(RELEASE).src.rpm
 TARBALL = $(FULL_PACKAGE_NAME).tar.gz
 # Currently local package is built for Moblin only: LSB version goes as a bundle of several RPMs
-LOCAL_PACKAGE_NAME = $(PACKAGE)-local-$(VERSION)$(VERSION_SUFFIX)-$(RELEASE).$(RPM_BUILD_ARCH).tar.gz
+LOCAL_PACKAGE_NAME = $(PACKAGE)-local-$(VERSION)-$(RELEASE).$(RPM_BUILD_ARCH).tar.gz
 
 # Temporary build directory
 TMP_BUILD_DIR = /tmp/$(FULL_PACKAGE_NAME)