Hello community, here is the log from the commit of package brp-check-suse for openSUSE:Factory checked in at Thu Jan 13 16:46:06 CET 2011. -------- --- brp-check-suse/brp-check-suse.changes 2010-11-10 11:12:12.000000000 +0100 +++ brp-check-suse/brp-check-suse.changes 2011-01-13 14:28:18.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Jan 13 14:26:41 CET 2011 - ro@suse.de + +- switch to git source +- integrate fix-mail patch + +------------------------------------------------------------------- +Mon Jan 10 18:37:11 CET 2011 - ro@suse.de + +- disable autoreqprov + +------------------------------------------------------------------- +Mon Jan 10 17:55:59 CET 2011 - ro@suse.de + +- really drop brp-check-bytecode-version +- integrate fix-mail patch into tarball + +------------------------------------------------------------------- +Mon Jan 10 13:00:04 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#465005 - drop brp-check-bytecode-version + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- brp-check-suse-fix_mail.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-check-suse.spec ++++++ --- /var/tmp/diff_new_pack.Cdx8L2/_old 2011-01-13 16:45:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Cdx8L2/_new 2011-01-13 16:45:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package brp-check-suse (Version 1.0) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,11 @@ Name: brp-check-suse License: Artistic License .. ; GPLv2+ Group: Development/Tools/Building -AutoReqProv: on +AutoReqProv: off Summary: build root policy check scripts Version: 1.0 -Release: 32 +Release: 33 Source0: %{name}-%{version}.tar.bz2 -Patch0: brp-check-suse-fix_mail.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" @@ -39,7 +38,6 @@ %prep %setup -q -%patch0 %build # nothing to do ++++++ brp-check-suse-1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/Makefile new/brp-check-suse-1.0/Makefile --- old/brp-check-suse-1.0/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/brp-check-suse-1.0/Makefile 2011-01-13 14:25:30.000000000 +0100 @@ -0,0 +1,15 @@ +PRJ=Base:System +PKG=brp-check-suse + +all: + +package: + @if test -d $(PKG); then cd $(PKG) && osc up && cd -; else osc co -c $(PRJ) $(PKG); fi + @./mkchanges | tee $(PKG)/.changes + @test ! -s $(PKG)/.changes || git push + @test -z "`git rev-list remotes/origin/master..master`" || { echo "unpushed changes"; exit 1; } + @f=(*bz2); test -z "$f" || /bin/rm -vi *.bz2 + @./mktar + @mv *bz2 $(PKG) + +.PHONY: all package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/brp-check-bytecode-version new/brp-check-suse-1.0/brp-check-bytecode-version --- old/brp-check-suse-1.0/brp-check-bytecode-version 2008-08-13 11:47:24.000000000 +0200 +++ new/brp-check-suse-1.0/brp-check-bytecode-version 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -#!/bin/bash - -# If using normal root, avoid changing anything. -if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi -if [ "$NO_BRP_CHECK_BYTECODE_VERSION" = "true" ] ; then - echo "NO_BRP_CHECK_BYTECODE_VERSION is set: skipping check" - exit 0 -fi - -#usage unjar <file> <directory> -function unjar() -{ - local file TMPDIR - file=$1 - TMPDIR=$2 - - if [[ $(type -p fastjar) ]]; then - UNJAR=fastjar - elif [[ $(type -p jar) ]]; then - UNJAR=jar - elif [[ $(type -p unzip) ]]; then - UNJAR=unzip - else - echo "ERROR: jar, fastjar, or unzip is not installed (trying file $file)" - exit 1 - fi - - case $UNJAR in - jar|fastjar) - pushd $TMPDIR &>/dev/null - # echo jar -xf $file - ${UNJAR} -xf $file - popd &> /dev/null - ;; - unzip) - unzip -oqq $file -d $TMPDIR - ;; - esac -} - - -TMPDIR=`mktemp -d /var/tmp/brp-java-XXXXXX` -OUTFILE=$TMPDIR/.out.$$ -for file in `find $RPM_BUILD_ROOT \( -name "*.jar" -o -name "*.war" \) -type f ;\ - test -d $RPM_BUILD_ROOT/usr/share/java && find $RPM_BUILD_ROOT/usr/share/java -name "*.zip" ;\ - test -d $RPM_BUILD_ROOT/usr/share/classpath && find $RPM_BUILD_ROOT/usr/share/classpath -name "*.zip" ` ; do - case $file in - *java-1.5.0-sun*|*java-1_5_0-ibm*|*groupwise/client*|*messenger/client*) - continue - ;; - esac - rm -rf $TMPDIR/* - #echo "DEBUG: unzipping $file" - TYPE=`file $file` - case $TYPE in - *Zip*) ;; - *) continue ;; - esac - - unjar $file $TMPDIR - #unzip -oqq $file -d $TMPDIR - find $TMPDIR -type d -exec chmod a+rwx {} \; - find $TMPDIR -type f -exec chmod a+r {} \; - JARNAME=${file##*/} - find $TMPDIR -print0 | xargs -0 file | while read line ; do - case $line in - *compiled\ Java\ class\ data*) - VERSION=${line##* } - VMAJ=${VERSION%.*} - VMIN=${VERSION#*.} - NAME=${line%%: *} - NAME=${NAME##$TMPDIR/} - # java-1.4 : maj = 48.0 - # java-1.5 : maj = 49.0 - # java-1.6 : maj = 50.0 - if test 0$VMAJ -gt 49 ; then - echo "$JARNAME: $NAME" >> $TMPDIR/.out.$$ - fi - ;; - esac - done -done - -if test -s $TMPDIR/.out.$$ ; then - echo "ERROR: the files below contain java bytecode for something later than java 1.5," - echo "ERROR: please set the javac target to 1.5 or lower." - cat $TMPDIR/.out.$$ - echo "ERROR: the files above contain java bytecode for something later than java 1.5," - echo "ERROR: please set the javac target to 1.5 or lower." - exit 1 -fi - -rm -rf $TMPDIR - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/brp-desktop.data/xdg_menu new/brp-check-suse-1.0/brp-desktop.data/xdg_menu --- old/brp-check-suse-1.0/brp-desktop.data/xdg_menu 2009-09-18 01:43:37.000000000 +0200 +++ new/brp-check-suse-1.0/brp-desktop.data/xdg_menu 2011-01-13 14:25:30.000000000 +0100 @@ -1980,7 +1980,7 @@ $output = output_validate($menu); print $output; if ( $validate_error eq 1 ) { - print "Errors in installed desktop file detected. Please mail stbinner\@suse.de, if you think this is wrong.\n"; + print "Errors in installed desktop file detected. Please refer to http://en.opensuse.org/SUSE_Package_Conventions/RPM_Macros\n"; exit 1; } exit 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/macros.brp new/brp-check-suse-1.0/macros.brp --- old/brp-check-suse-1.0/macros.brp 2010-11-09 17:06:00.000000000 +0100 +++ new/brp-check-suse-1.0/macros.brp 2011-01-13 14:25:30.000000000 +0100 @@ -10,7 +10,6 @@ /usr/lib/rpm/brp-rootfs \ /usr/lib/rpm/brp-tcl \ /usr/lib/rpm/brp-check-python \ - /usr/lib/rpm/brp-check-bytecode-version \ /usr/lib/rpm/brp-boot-scripts \ /usr/lib/rpm/brp-hook \ %{nil} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/mkchanges new/brp-check-suse-1.0/mkchanges --- old/brp-check-suse-1.0/mkchanges 1970-01-01 01:00:00.000000000 +0100 +++ new/brp-check-suse-1.0/mkchanges 2011-01-13 14:25:30.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/sh +# create log suitable for c&p into rpm changes file +if [ -z "$1" ]; then + set -- remotes/origin/master..master +fi +# no idea why it always prints those commit lines +git rev-list --pretty=format:" - %s" "$@" |grep -v ^commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/mktar new/brp-check-suse-1.0/mktar --- old/brp-check-suse-1.0/mktar 1970-01-01 01:00:00.000000000 +0100 +++ new/brp-check-suse-1.0/mktar 2011-01-13 14:25:30.000000000 +0100 @@ -0,0 +1,13 @@ +#!/bin/sh +set -e +NAME=brp-check-suse +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" +pfx="$NAME${fullver:+-$fullver}" +fn="$pfx".tar.bz2 +git archive --prefix="$pfx"/ HEAD | bzip2 > $fn +echo "version $fullver -> $fn" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/patches new/brp-check-suse-1.0/patches --- old/brp-check-suse-1.0/patches 2011-01-13 16:45:32.000000000 +0100 +++ new/brp-check-suse-1.0/patches 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-1.0/series new/brp-check-suse-1.0/series --- old/brp-check-suse-1.0/series 2010-11-09 17:05:26.000000000 +0100 +++ new/brp-check-suse-1.0/series 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# Patch series file for quilt, created by quilt setup -# Source: brp-check-suse-1.0.tar.bz2 -# Patchdir: brp-check-suse-1.0 -# -brp-check-suse-fix_mail.patch -p0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org