Hello community, here is the log from the commit of package inst-source-utils checked in at Thu Nov 20 15:31:12 CET 2008. -------- --- inst-source-utils/inst-source-utils.changes 2008-11-13 00:14:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2008-11-20 12:44:21.351836000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 20 12:42:40 CET 2008 - ro@suse.de + +- create_package_descr: add -T option for xtags file + format: "packagename: literal text" so that "literal text" + will be directly included for the package data + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.D26474/_old 2008-11-20 15:29:24.000000000 +0100 +++ /var/tmp/diff_new_pack.D26474/_new 2008-11-20 15:29:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package inst-source-utils (Version 2008.11.17) +# spec file for package inst-source-utils (Version 2008.11.20) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Obsoletes: autoyast2-utils <= 2.14.10 Provides: autoyast2-utils = 2.14.10 Summary: Utilities for creating customized installation sources -Version: 2008.11.17 +Version: 2008.11.20 Release: 1 Source: inst-source-utils.tar.bz2 Source1: split.pl @@ -60,6 +60,10 @@ %_datadir/%name %changelog +* Thu Nov 20 2008 ro@suse.de +- create_package_descr: add -T option for xtags file + format: "packagename: literal text" so that "literal text" + will be directly included for the package data * Thu Nov 13 2008 ro@suse.de - mk_listings: exclude .cr-cache and .snapshot * Thu Oct 16 2008 lrupp@suse.de ++++++ inst-source-utils.tar.bz2 ++++++ 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 2008-11-17 17:03:30.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_package_descr 2008-11-20 15:29:17.000000000 +0100 @@ -73,6 +73,7 @@ print " [-o OUTPUT_DIR ] (default `cwd`/setup/descr)\n"; print " [-c CACHE_DIR ] (default none)\n"; print " [-M MAXDEPTH ] (default $maxdepth, depth for du-file)\n"; + print " [-T XTAGS_FILE ] (extra hacks)\n"; print " [-Z ] (add_licenses)\n"; print " [-V ] (add_vendor for each rpm)\n"; print " [-S ] (ignore_sources)\n"; @@ -126,6 +127,7 @@ elsif ( $arg eq "-p" ) { $pdb_data_dir = shift @ARGV ; } elsif ( $arg eq "-r" ) { $extra_requires = shift @ARGV ; } elsif ( $arg eq "-x" ) { $extra_provides = shift @ARGV ; } + elsif ( $arg eq "-T" ) { $extra_tags = shift @ARGV ; } else { print STDERR "\nunknown parameter $arg\n\n"; usage(1); @@ -176,6 +178,14 @@ print "WARNING: extra_requires : file $extra_requires not found!\n"; } } +if ( $extra_tags ) { + if ( -f $extra_tags ) { + print "INFO: extra_tags : $extra_tags\n"; + %xtaglist = %{ReadFileToHash( $extra_tags )}; + } else { + print "WARNING: extra_tags : file $extra_tags not found!\n"; + } +} unless ( -d $output_dir ) { print "INFO: creating output directory $output_dir\n"; @@ -375,7 +385,9 @@ WriteSEntry( $pkg_main, "Loc", "$media_number $filename $file_arch"); } WriteSEntry( $pkg_main, "Siz", "$filesize $res{1009}[0]" ); - + + print $pkg_main $xtaglist{$rpm_name}."\n" if ($xtaglist{$rpm_name} && $res{1044}[0]); + if ( $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"} ) { $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"); @@ -547,6 +559,7 @@ local ($le,$ri) = split (/:/, $_, 2 ); $le =~ s/^\s*(.*)\s*$/$1/; $ri =~ s/^\s*(.*)\s*$/$1/; + $ri =~ s/\\n/\n/g; $temp{$le}=$ri; } close ($FH); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org