Changeset 951

Timestamp:

Jun 25, 2011, 7:54:31 PM (14 years ago)

Author:

joergs

Message:

bugfix: do not modify spec file, when building package from SPECSOURCES (instead of SOURCES)

File:

• dassbuild/trunk/usr/bin/dassbuild_prepare.sh (modified) (4 diffs)

dassbuild/trunk/usr/bin/dassbuild_prepare.sh

@@ -31 +31 @@
 
 [ -z "$BUILD_USES_SVN" ] && BUILD_USES_SVN="yes"
+[ -z "$BUILD_MODIFIES_SPEC" ] && BUILD_MODIFIES_SPEC="yes"
 
 if [ -z "$1" ]; then
@@ -41 +42 @@
     PACKAGE=`rpm -qp --qf "%{NAME}" $1`
     VERSION=`rpm -qp --qf "%{VERSION}" $1`
+    unset BUILD_MODIFIES_SPEC
 fi
 
@@ -154 +156 @@
         mkdir -p ${BUILDTEMP}/src/${PACKAGE}
         cp -av `cat SPECSOURCES` ${BUILDTEMP}/src/${PACKAGE}
+
+        # do not modify SPEC-file
+        unset BUILD_MODIFIES_SPEC
     
     else 
@@ -165 +170 @@
 
     echo $SVN_BUILD_RELEASE
-    if [ "$SVN_BUILD_RELEASE" ]; then
-        # Release will be overwritten bei OpenSUSE build service,
-        # therefore we add SVN_BUILD_RELEASE to Version
-        #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 -i "s/^Version:.*/Version: $VERSION/ig" ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-    fi
-
-    if [ "$SOURCE_ARCHIVE" ]; then
-        sed -i "s/^Source:.*/Source: $SOURCE_ARCHIVE/ig" ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+    if [ "$BUILD_MODIFIES_SPEC" = "yes" ]; then
+        if [ "$SVN_BUILD_RELEASE" ]; then
+            # Release will be overwritten bei OpenSUSE build service,
+            # therefore we add SVN_BUILD_RELEASE to Version
+            #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 -i "s/^Version:.*/Version: $VERSION/ig" ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+        fi
+
+        if [ "$SOURCE_ARCHIVE" ]; then
+            sed -i "s/^Source:.*/Source: $SOURCE_ARCHIVE/ig" ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+        fi
     fi