From 32b6108bc32d6b8032678138675eec182d6c91fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 20 Feb 2012 17:01:55 +0000 Subject: [PATCH] Fix gridsite RPM version (age and distribution name). --- org.glite.lb/configure | 6 +++--- org.gridsite.core/src/Makefile | 1 + org.gridsite.core/src/make-gridsite-spec | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 3377a05..eff87cc 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -1559,12 +1559,12 @@ sub mode_etics { if ($project ne 'glite') { # don't evaluate pkg-config calls to get them into source package - $flags = 'RELEASE_VERSION=${age}.${platformFamily} + $flags = 'RELEASE_VERSION=${age} GSOAPDIR=\`pkg-config gsoap --variable=prefix\` OPENSSL_GLOBUS_FLAGS=\`pkg-config globus-openssl --cflags\` OPENSSL_GLOBUS_LIBS=\`pkg-config globus-openssl --libs\`'; } else { - $flags = 'RELEASE_VERSION=${age}.${platformFamily} + $flags = 'RELEASE_VERSION=${age} GSOAPDIR=${gsoap.location} OPENSSL_GLOBUS_FLAGS=-I${globus.location}/include/${globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${globus.location}/${libdir} @@ -1603,7 +1603,7 @@ sub mode_etics { MINOR_VERSION=1.5 PATCH_VERSION=1.5.0 VERSION=\\\$(PATCH_VERSION) - RELEASE_VERSION=\${age}.\${platformFamily} + RELEASE_VERSION=\${age} GSOAPDIR=\\`pkg-config gsoap --variable=prefix\\` OPENSSL_GLOBUS_FLAGS=\\`pkg-config globus-openssl --cflags\\` OPENSSL_GLOBUS_LIBS=\\`pkg-config globus-openssl --libs\\` diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 824bb28..f5eb066 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -565,6 +565,7 @@ htcp-bin: htcp rpm: dist export PATCH_VERSION=$(PATCH_VERSION) ; \ export MINOR_VERSION=$(MINOR_VERSION) ; \ + export RELEASE_VERSION=$(RELEASE_VERSION) && \ export project=$(project); \ ./make-gridsite-spec rm -Rf $(MYRPMDIR)/BUILDROOT $(MYRPMDIR)/BUILD diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec index 1269378..14694c6 100755 --- a/org.gridsite.core/src/make-gridsite-spec +++ b/org.gridsite.core/src/make-gridsite-spec @@ -44,7 +44,7 @@ cat <gridsite.spec Name: gridsite Version: ${PATCH_VERSION:-1.x.x} # This next piece of .spec/sed magic puts the build OS version in the release -Release: %(if [ "$RELEASE_VERSION" ] ; then echo $RELEASE_VERSION ; else sed 's/^\([A-Z,a-z]\)[^ ]* \([A-Z,a-z]\)[^0-9]*\([0-9][^ ]*\).*/1\1\2\3/g' /etc/redhat-release | sed 's/[^A-Z,a-z,0-9]//g' ; fi) +Release: %(if [ "$RELEASE_VERSION" ] ; then echo $RELEASE_VERSION ; else echo '1' ; fi)%{?dist} Summary: GridSite License: Modified BSD Group: System Environment/Daemons -- 1.8.2.3