Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at 2014-02-02 07:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/post-build-checks (Old) and /work/SRC/openSUSE:Factory/.post-build-checks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "post-build-checks" Changes: -------- --- /work/SRC/openSUSE:Factory/post-build-checks/post-build-checks.changes 2014-01-09 17:36:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.post-build-checks.new/post-build-checks.changes 2014-02-02 07:43:49.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Jan 31 15:31:34 CET 2014 - [email protected] + +- adapt uname linking in specfile to /usr move (bnc#860600) + +------------------------------------------------------------------- +Fri Jan 31 14:26:05 UTC 2014 - [email protected] + +- adapt uname.sh helper to 3.XX.Y kernel versioning scheme +- obs removes dashes... +- fix mktar to match service file +- do not mount and umount /proc in checks - the build script handles that + +------------------------------------------------------------------- Old: ---- post-build-checks-13.2+git20140109.507e5c2.tar.xz New: ---- post-build-checks-13.2+git20140131.590c07b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.F7JlGf/_old 2014-02-02 07:43:50.000000000 +0100 +++ /var/tmp/diff_new_pack.F7JlGf/_new 2014-02-02 07:43:50.000000000 +0100 @@ -20,7 +20,7 @@ Summary: post checks for build after rpms have been created License: GPL-2.0+ Group: Development/Tools/Building -Version: 13.2+git20140109.507e5c2 +Version: 13.2+git20140131.590c07b Release: 0 PreReq: aaa_base permissions sed Requires: aaa_base-malloccheck @@ -88,17 +88,25 @@ fi sed -i -e "s@^PERMISSION_SECURITY=.*@PERMISSION_SECURITY=\"secure\"@" /etc/sysconfig/security sed -i -e "s@^TIMEZONE=.*@TIMEZONE=\"UTC\"@" /etc/sysconfig/clock -if test -f /bin/uname -a ! -L /bin/uname ; then - mv /bin/uname /bin/uname.bin - ln -s /usr/lib/build/helper/uname.sh /bin/uname +UNAME=/bin/uname +if test -f /usr/bin/uname ; then + UNAME=/usr/bin/uname +fi +if test -f $UNAME -a ! -L $UNAME ; then + mv $UNAME $UNAME.bin + ln -s /usr/lib/build/helper/uname.sh $UNAME fi %preun if ! test -e /.buildenv; then exit 0 fi -if test "$1" = 0 -a -f /bin/uname.bin ; then - mv /bin/uname.bin /bin/uname +UNAME=/bin/uname +if test -f /usr/bin/uname.bin ; then + UNAME=/usr/bin/uname +fi +if test "$1" = 0 -a -f $UNAME.bin ; then + mv $UNAME.bin $UNAME fi %files ++++++ post-build-checks-13.2+git20140109.507e5c2.tar.xz -> post-build-checks-13.2+git20140131.590c07b.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-13.2+git20140109.507e5c2/helper/uname.sh new/post-build-checks-13.2+git20140131.590c07b/helper/uname.sh --- old/post-build-checks-13.2+git20140109.507e5c2/helper/uname.sh 2014-01-09 12:05:49.000000000 +0100 +++ new/post-build-checks-13.2+git20140131.590c07b/helper/uname.sh 2014-01-31 15:24:53.000000000 +0100 @@ -29,7 +29,7 @@ fi if test -n "$MREL" ; then - echo $OUTPUT | sed -e "s/[0-9]\.[0-9]\.[0-9][-.0-9a-zA-Z_]*/$MREL/" + echo $OUTPUT | sed -e "s/[0-9]\.[0-9]\+\.[0-9][-.0-9a-zA-Z_]*/$MREL/" else echo $OUTPUT fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-13.2+git20140109.507e5c2/obs/mkpackage new/post-build-checks-13.2+git20140131.590c07b/obs/mkpackage --- old/post-build-checks-13.2+git20140109.507e5c2/obs/mkpackage 2014-01-09 12:05:49.000000000 +0100 +++ new/post-build-checks-13.2+git20140131.590c07b/obs/mkpackage 2014-01-31 15:24:53.000000000 +0100 @@ -22,12 +22,12 @@ cd "$src" "$src"/obs/mkchanges "$name/$name".changes | tee "$name"/.changes #test ! -s $name/.changes || git push -for i in *.bz2; do +for i in *.xz; do /bin/rm -vi "$i" done cd "$src" "$src"/obs/mktar -mv *bz2 "$name" +mv *xz "$name" cd "$name" osc vc "$name".changes .changes && rm -f .changes cd "$src" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-13.2+git20140109.507e5c2/obs/mktar new/post-build-checks-13.2+git20140131.590c07b/obs/mktar --- old/post-build-checks-13.2+git20140109.507e5c2/obs/mktar 2014-01-09 12:05:49.000000000 +0100 +++ new/post-build-checks-13.2+git20140131.590c07b/obs/mktar 2014-01-31 15:24:53.000000000 +0100 @@ -1,13 +1,10 @@ #!/bin/sh set -e NAME=post-build-checks -VERSION=1.0 -datefmt="%Y.%m.%d.%H%M" -LAST_COMMIT=(`git rev-list --timestamp HEAD^..HEAD`) -DATE=`date +$datefmt -d "1970-01-01 00:00 UTC $LAST_COMMIT seconds"` -#scmver="$DATE" -fullver="$VERSION${scmver:+_}$scmver" +VERSION=13.2 +scmver=`git log -n1 --date=short --pretty=format:"$VERSION+git%cd.%h"|sed 's@-@@g'` +fullver="$scmver" pfx="$NAME${fullver:+-$fullver}" -fn="$pfx".tar.bz2 -git archive --prefix="$pfx"/ HEAD | bzip2 > $fn +fn="$pfx".tar.xz +git archive --prefix="$pfx"/ HEAD | xz > $fn echo "version $fullver -> $fn" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
