Changeset 721 for trunk/technical

Timestamp:

Oct 2, 2008, 5:16:21 PM (16 years ago)

Author:

joergs

Message:

modify Version, instead of Release, because Release is set by openSUSE build service

File:

• trunk/technical/common/build/svn_build_prepare.sh (modified) (5 diffs)

trunk/technical/common/build/svn_build_prepare.sh

@@ -9 +9 @@
 BUILDTEMP=$DEST_DIR/buildsrc/
 
+[ -z "$BUILD_USES_SVN" ] && BUILD_USES_SVN="yes"
 
 if [ -z "$1" ]; then
@@ -17 +18 @@
 elif [ -r "$1" ]; then
     # parameter is src.rpm file
-        PACKAGE=`rpm -qp --qf "%{NAME}" $1`
-        VERSION=`rpm -qp --qf "%{VERSION}" $1`
+    PACKAGE=`rpm -qp --qf "%{NAME}" $1`
+    VERSION=`rpm -qp --qf "%{VERSION}" $1`
 fi
 
@@ -61 +62 @@
             SVN_BUILD_RELEASE=${SVN_BUILD_RELEASE}p
         else # check if RPM has been build already
+            # TODO: this chekc is broken for OpenSUSE build service,
+            #       because version is changed later on
             EXPECTED_DEST_RPM_FILENAME=${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-${VERSION}-${SVN_BUILD_RELEASE}.*.rpm
             if [ -f $EXPECTED_DEST_RPM_FILENAME ]; then
@@ -70 +73 @@
         fi
         if [ "$SVN_BUILD_RELEASE" ]; then
-            sed "s/^Release:.*/Release: $SVN_BUILD_RELEASE/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+            # Release will be overwritten bei OpenSUSE build service,
+            # therefore we add SVN_BUILD_RELEASE to Version
+            VERSION_ORIG=$VERSION
+            VERSION=$VERSION.$SVN_BUILD_RELEASE
+            #sed "s/^Release:.*/Release: $SVN_BUILD_RELEASE/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+            #sed -r "s/^(Version:\s*\S*)/\1.$SVN_BUILD_RELEASE/ig"  $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+            sed "s/^Version:.*/Version: $VERSION/ig" $SPECFILE > ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
         fi
         echo "SVN_BUILD_RELEASE: $SVN_BUILD_RELEASE"
         
+        printf "adding subversion changelog: "
         # changelog header
         DATE=`unset LANG; date +"%a %b %d %Y"`
@@ -95 +105 @@
             cat Changes | sed 's/\(^[\*]\+\)//g' >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
         fi
+        printf "done\n"
     fi
     # just make sure, that the Changes file exist