[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1932: Fix the setting of SKIP_DEVEL_VERSIONS in the package makefile.

[Jeff Licquia]

------------------------------------------------------------
revno: 1932
committer: Jeff Licquia <jeff at licquia.org>
branch nick: build_env-fixversion
timestamp: Wed 2012-03-28 22:41:25 -0400
message:
  Fix the setting of SKIP_DEVEL_VERSIONS in the package makefile.
modified:
  package/Makefile
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2012-03-24 14:02:13 +0000
+++ b/package/Makefile	2012-03-29 02:41:25 +0000
@@ -7,6 +7,23 @@
 PACKAGE=lsb-build
 BZR_MODULE=build_env
 
+# Derive date string for daily snapshots
+ISO_DATE:=$(shell date +"%Y%m%d")
+PWD:=$(shell pwd)
+
+# Handle different version generation for daily snapshots than official builds
+# OFFICIAL_RELEASE should be set to the bzr tag to use for exporting
+ifdef OFFICIAL_RELEASE
+VERSION_SUFFIX=
+EXPORT_TAG=--revision=$(OFFICIAL_RELEASE)
+ifndef SKIP_DEVEL_VERSIONS
+SKIP_DEVEL_VERSIONS=yes
+endif
+else
+VERSION_SUFFIX=.$(ISO_DATE)
+EXPORT_TAG=
+endif
+
 # Supply default LSBVERSION - target spec version.
 # a big second number (80-99) is leading up to next major spec
 # build_env is version-independent so can wait till late to bump this
@@ -29,10 +46,6 @@
 # we need to be able to work out what the produced rpm files will be called
 RPM_PACKAGE_RELEASE=7
 
-# Derive date string for daily snapshots
-ISO_DATE:=$(shell date +"%Y%m%d")
-PWD:=$(shell pwd)
-
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
 
@@ -57,19 +70,6 @@
 RPM_BINARY_DESKTOP=$(FULL_PACKAGE_DESKTOP)-$(RPM_PACKAGE_RELEASE).$(RPM_BUILD_ARCH).rpm
 RPM_SOURCE_NAME=$(FULL_PACKAGE_NAME)-$(RPM_PACKAGE_RELEASE).src.rpm
 
-# Handle different version generation for daily snapshots than official builds
-# OFFICIAL_RELEASE should be set to the bzr tag to use for exporting
-ifdef OFFICIAL_RELEASE
-VERSION_SUFFIX=
-EXPORT_TAG=--revision=$(OFFICIAL_RELEASE)
-ifndef SKIP_DEVEL_VERSIONS
-SKIP_DEVEL_VERSIONS=yes
-endif
-else
-VERSION_SUFFIX=.$(ISO_DATE)
-EXPORT_TAG=
-endif
-
 # Get value of RPM_PACKAGE_VERSION from LSBVERSION.
 RPM_PACKAGE_VERSION=$(LSBVERSION)