Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at Mon Mar 9 00:20:00 CET 2009. -------- --- inst-source-utils/inst-source-utils.changes 2009-02-25 11:11:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2009-03-06 11:59:05.116631000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 6 11:58:45 CET 2009 - ro@suse.de + +- create_package_descr: add -Q option to disable Shr tag + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.O28956/_old 2009-03-09 00:19:31.000000000 +0100 +++ /var/tmp/diff_new_pack.O28956/_new 2009-03-09 00:19:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package inst-source-utils (Version 2009.2.26) +# spec file for package inst-source-utils (Version 2009.3.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: inst-source-utils Summary: Utilities for creating customized installation sources -Version: 2009.2.26 +Version: 2009.3.8 Release: 1 Url: http://en.opensuse.org/Inst-source-utils License: GPL v2 or later @@ -61,6 +61,8 @@ %_datadir/%name %changelog +* Fri Mar 06 2009 ro@suse.de +- create_package_descr: add -Q option to disable Shr tag * Wed Feb 25 2009 lrupp@suse.de - create_package_descr: more help text for the -T XTAGS_FILE - create_sha1sum, create_md5sums - fix bnc#460894: handle multiple ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_md5sums new/inst-source-utils/usr/bin/create_md5sums --- old/inst-source-utils/usr/bin/create_md5sums 2009-02-26 03:09:51.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_md5sums 2009-03-09 00:19:27.000000000 +0100 @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, # USA. # -# $Id: create_md5sums,v 1.11 2009/01/27 14:13:14 lrupp Exp lrupp $ +# $Id: create_md5sums 110 2009-03-06 15:30:14Z lrupp $ # function usage (){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_package_descr new/inst-source-utils/usr/bin/create_package_descr --- old/inst-source-utils/usr/bin/create_package_descr 2009-02-26 03:09:51.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_package_descr 2009-03-09 00:19:27.000000000 +0100 @@ -59,6 +59,7 @@ my $src_requires = 0; my $default_lang="english"; my $add_vendor = 0; +my $allow_shr = 1; sub usage { my $exit_code=shift || 1; @@ -83,6 +84,7 @@ print " [-K ] (do_keywords)\n"; print " [-F ] (do_file_list)\n"; print " [-B ] (add requires for src packages)\n\n"; + print " [-Q ] (never use Shr tags)\n\n"; print " Note: the -T option allows to add additional tags to the\n"; print " resulting packages file.\n"; print " The file should contain the package name, a colon and\n"; @@ -131,6 +133,7 @@ elsif ( $arg eq "-P" ) { $prefer_yastdescr = "1"; } elsif ( $arg eq "-S" ) { $ignore_sources = "1"; } elsif ( $arg eq "-Z" ) { $add_licenses = "1" ; } + elsif ( $arg eq "-Q" ) { $allow_shr = 0; } elsif ( $arg eq "-c" ) { push @SHA_CACHEDIR , shift @ARGV ; } elsif ( $arg eq "-i" ) { push @IGNOREDIRS, shift @ARGV ; } elsif ( $arg eq "-l" ) { push @LANGUAGES , shift @ARGV ; } @@ -402,7 +405,7 @@ WriteAnyEntry( $pkg_main , $xtaglist{$rpm_name} ) if ($xtaglist{$rpm_name} && $res{1044}[0]); - if ( $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"} ) { + if ($SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"} && $allow_shr) { $found_in = $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"}; WriteSEntry( $pkg_main, "Shr", "$res{1000}[0] $res{1001}[0] $res{1002}[0] $found_in"); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_sha1sum new/inst-source-utils/usr/bin/create_sha1sum --- old/inst-source-utils/usr/bin/create_sha1sum 2009-02-26 03:09:51.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sum 2009-03-09 00:19:27.000000000 +0100 @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, # USA. # -# $Id: create_sha1sum,v 1.1 2009/01/27 14:12:50 lrupp Exp lrupp $ +# $Id: create_sha1sum 110 2009-03-06 15:30:14Z lrupp $ # function usage (){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/create_sha1sums new/inst-source-utils/usr/bin/create_sha1sums --- old/inst-source-utils/usr/bin/create_sha1sums 2009-02-26 03:09:51.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sums 2009-03-09 00:19:27.000000000 +0100 @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, # USA. # -# $Id: create_sha1sums 104 2009-02-19 14:21:03Z lrupp $ +# $Id: create_sha1sums 109 2009-03-06 15:29:58Z lrupp $ # SIGN="yes" @@ -90,7 +90,7 @@ fi pushd $CDS_PRIM >/dev/null if [ "$EXTRA" = "yes" ] ; then - for i in license.tar.gz control.xml installation.xml media.1/info.txt media.1/license.zip ; do + for i in license.tar.gz control.xml installation.xml media.1/info.txt media.1/license.zip y2update.tgz driverupdate; do test -f $i || continue sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl new/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl --- old/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl 2009-02-26 03:09:51.000000000 +0100 +++ new/inst-source-utils/usr/bin/gen-s390-cd-kernel.pl 2009-03-09 00:19:27.000000000 +0100 @@ -22,7 +22,7 @@ # Boston, MA 02110-1301, # USA. # -# $Id: gen-s390-cd-kernel.pl 101 2009-01-28 16:20:37Z lrupp $ +# $Id: gen-s390-cd-kernel.pl 107 2009-03-06 11:48:14Z ro $ use FileHandle; use Getopt::Long; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org