Changeset 946

Timestamp:

Jun 17, 2011, 12:15:51 AM (13 years ago)

Author:

joergs

Message:

create $PACKAGES.changes instead of Changes. This is done, because this is supported by the openSUSE Build Service. Format have changed

File:

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

dassbuild/trunk/usr/bin/dassbuild_prepare.sh

@@ -112 +112 @@
         printf "adding subversion changelog: "
         # changelog header
-        DATE=`unset LANG; date +"%a %b %d %Y"`
-        echo -e "* $DATE - svn_build\n" > Changes
+        echo "-------------------------------------------------------------------" > Changes
+        DATE=`unset LANG; date +"%a %b %d %T UTC %Y"`
+        echo -e "$DATE - svn_build@localhost\n" >> Changes
         echo "- Subversion status:" >> Changes
         # additional infos for the Changes file (see if everything is checked in)
@@ -121 +122 @@
         # requires connection to the subversion server
         svn log -v . > ChangeLog.new && mv ChangeLog.new ChangeLog
-        cat ChangeLog >> Changes
-
+        # indent all svn revisions by "- ", to form a changelog entry,
+        # changelog format uses * at the start of the line to determine new entry,
+        #   therefore replace our * by -
+        # % may be treated as a macro, there replaced by %%
+        sed -r -e 's/^(r[0-9]+ \|)/- \1/' -e 's/(^[\*]+)/-/g' -e 's/%/%%/g'  ChangeLog >> Changes
+        mv Changes $PACKAGE.changes
         printf "done\n"
     fi
-
-    # just make sure, that the Changes file exists
-    touch Changes
 
     # if "SOURCES" file exist, create tar file on the fly
@@ -159 +161 @@
 
     # copy orig SPEC-file (may be modified later)
-    cp -a $SPECFILE ${BUILDTEMP}/src/${PACKAGE}
+    cp -a $SPECFILE ${BUILDTEMP}/src/${PACKAGE}/
+    test -r ${PACKAGE}.changes && cp -a ${PACKAGE}.changes ${BUILDTEMP}/src/${PACKAGE}/
 
     echo $SVN_BUILD_RELEASE
@@ -176 +179 @@
     # if there is no changelog section in the spec file,
     # also append the Changes there
-    if ! grep -q -i "%changelog" $SPECFILE ; then
-        # paste "Changes" into SPEC file. 
-        echo "%changelog" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-        # without trailing *, except for the initial
-        echo -n "*" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-        cat Changes | sed 's/\(^[\*]\+\)//g' >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
-    fi
+    # if ! grep -q -i "%changelog" $SPECFILE ; then
+    #     # paste "Changes" into SPEC file. 
+    #     echo "%changelog" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+    #     # without trailing *, except for the initial
+    #     echo -n "*" >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+    #     cat Changes | sed 's/\(^[\*]\+\)//g' >> ${BUILDTEMP}/src/${PACKAGE}/$SPECFILE
+    # fi
 
     # if there is a directory named "debian", prepare the
@@ -213 +216 @@
     fi
 
-
 fi
 exit 0