Sync

diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION
index 990175b..6bc79df 100644 (file)
--- a/org.gridsite.core/VERSION
+++ b/org.gridsite.core/VERSION
@@ -1,5 +1,5 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1.5
-PATCH_VERSION=1.5.10.4
+PATCH_VERSION=1.5.10.5
 DEFVERSION=010510
 VERSION=$(PATCH_VERSION)

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 5a095ef..78572ff 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -490,6 +490,7 @@ htcp-bin: htcp
 # RPM targets: build and RPMs go into subdirectories of ../RPMTMP/
 rpm: dist
        export PATCH_VERSION=$(PATCH_VERSION) ; \
+        export RELEASE_VERSION=$(RELEASE_VERSION) ; \
         export MINOR_VERSION=$(MINOR_VERSION) ; \
         export MYPREFIX=/usr ; \
         ./make-gridsite-spec