[Lsb-messages] /var/www/bzr/lsb/devel/runtime-test r1289: fix up version stuff again (bug 3599) and stamp out freestandards.org

[Mats Wichmann]

------------------------------------------------------------
revno: 1289
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: runtime-test-vers
timestamp: Thu 2014-04-10 14:23:12 -0600
message:
  fix up version stuff again (bug 3599) and stamp out freestandards.org
modified:
  scripts/package/Makefile
-------------- next part --------------
=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2013-05-02 22:11:54 +0000
+++ b/scripts/package/Makefile	2014-04-10 20:23:12 +0000
@@ -1,7 +1,7 @@
 # values used to populate .spec from .spec.sed
 PACKAGE=lsb-test-core
 VERSION=4.1.91
-RELEASE=1
+BUILDNO=2
 # PAM Version
 PVERSION=0.99.8.1
 SYSLOGVER=1.4.2rh
@@ -13,6 +13,17 @@
 ISO_DATE=$(shell date +"%Y%m%d")
 PWD=$(shell pwd)
 
+# Handle different version generation for snapshots than for official builds
+# OFFICIAL_RELEASE should be set to the tag to extract from CVS
+ifdef OFFICIAL_RELEASE
+# EXPORT_TAG should be set to the bzr revisionspec to use
+EXPORT_TAG=--revision=$(OFFICIAL_RELEASE)
+RELEASE=$(BUILDNO)
+else
+EXPORT_TAG=
+RELEASE=0.$(ISO_DATE).$(BUILDNO)
+endif
+
 FULL_PACKAGE_NAME=$(PACKAGE)-$(VERSION)
 TARBALL=$(PACKAGE)-$(VERSION).tar.gz
 PAM_TARBALL=Linux-PAM-$(PVERSION).tar.bz2
@@ -23,16 +34,6 @@
 # Temporary build directory
 TMP_BUILD_DIR=$(HOME)/tmp/$(FULL_PACKAGE_NAME)
 
-# Handle different version generation for snapshots than for official builds
-# OFFICIAL_RELEASE should be set to the tag to extract from CVS
-ifdef OFFICIAL_RELEASE
-# EXPORT_TAG should be set to the bzr revisionspec to use
-EXPORT_TAG=--revision=$(OFFICIAL_RELEASE)
-else
-RELEASE=0.$(ISO_DATE)
-EXPORT_TAG=
-endif
-
 # Determine whether to use rpm or rpmbuild to build the packages
 ifeq ($(wildcard /usr/bin/rpmbuild),)
 	RPM_BUILD_CMD=rpm
@@ -56,7 +57,7 @@
 RPM_SRPM_DIR=$(RPM_TMP_BUILD_DIR)/SRPMS
 
 # Override this on the command line to use a different repo
-BZRTREES?=http://bzr.freestandards.org/lsb/devel
+BZRTREES?=http://bzr.linuxfoundation.org/lsb/devel
 BZR_MODULE=runtime-test
 
 # Default target