Hello community, here is the log from the commit of package inst-source-utils checked in at Mon Nov 24 16:08:21 CET 2008. -------- --- inst-source-utils/inst-source-utils.changes 2008-11-20 12:44:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2008-11-24 15:12:21.097451000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 24 15:12:14 CET 2008 - ro@suse.de + +- update create_package_descr + +------------------------------------------------------------------- +Mon Nov 24 13:53:46 CET 2008 - lrupp@suse.de + +- fix pathnames + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.J30226/_old 2008-11-24 16:08:02.000000000 +0100 +++ /var/tmp/diff_new_pack.J30226/_new 2008-11-24 16:08:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package inst-source-utils (Version 2008.11.20) +# spec file for package inst-source-utils (Version 2008.11.24) # # 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.20 +Version: 2008.11.24 Release: 1 Source: inst-source-utils.tar.bz2 Source1: split.pl @@ -60,6 +60,10 @@ %_datadir/%name %changelog +* Mon Nov 24 2008 ro@suse.de +- update create_package_descr +* Mon Nov 24 2008 lrupp@suse.de +- fix pathnames * Thu Nov 20 2008 ro@suse.de - create_package_descr: add -T option for xtags file format: "packagename: literal text" so that "literal text" ++++++ 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-20 15:29:17.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_package_descr 2008-11-24 16:07:55.000000000 +0100 @@ -106,6 +106,12 @@ return @res; } +my @SAVEARGS; + +for (@ARGV) { + push @SAVEARGS, $_; +} + while ( $arg = shift ( @ARGV ) ) { if ( $arg eq "-d" ) { push @DATADIRS , shift @ARGV ; } elsif ( $arg eq "-B" ) { $src_requires = 1; } @@ -361,6 +367,8 @@ } WriteSeparator( $pkg_main ); + WriteComment( $pkg_main, @SAVEARGS ); + WriteSeparator( $pkg_main ); WriteSEntry( $pkg_main, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0] $file_arch"); WriteSEntry( $pkg_main, "Cks", "SHA1 $checksum") if ($checksum); if ( $res{1044}[0] ) { @@ -386,7 +394,7 @@ } WriteSEntry( $pkg_main, "Siz", "$filesize $res{1009}[0]" ); - print $pkg_main $xtaglist{$rpm_name}."\n" if ($xtaglist{$rpm_name} && $res{1044}[0]); + WriteAnyEntry( $pkg_main , $xtaglist{$rpm_name} ) 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]"}; @@ -571,6 +579,16 @@ print $FH "##----------------------------------------\n"; } +sub WriteComment { + my ($FH,@XX) = @_; + print $FH "## ".join(" ",@XX)."\n"; +} + +sub WriteAnyEntry { + my ($FH,$value) = @_; + print $FH "$value\n"; +} + sub WriteSEntry { my ($FH,$tag,$value) = @_; if ( $value ) { print $FH "=$tag: $value\n"; } 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 2008-11-20 15:29:17.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sums 2008-11-24 16:07:55.000000000 +0100 @@ -105,7 +105,7 @@ SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide" fi if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then - //bin/tools/create_sha1sum --quiet "$SLIDESHOWDIR" + /usr/bin/create_sha1sum --quiet "$SLIDESHOWDIR" fi for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do signit "$sha1sumfile" ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.J30226/_old 2008-11-24 16:08:02.000000000 +0100 +++ /var/tmp/diff_new_pack.J30226/_new 2008-11-24 16:08:02.000000000 +0100 @@ -20,7 +20,14 @@ #copy binaries for i in $BINFILES ; do echo "Preparing: $(basename $i)" - sed -e "s|/work/abuild/lib/abuild|$MODULEDIR|g" -e "s|/work/abuild|$SUSEDIR|g" -e "s|/work/cd|$SUSEDIR|g" -e "s|/work/src/bin|$SUSEDIR|g" -e "s|/work/built/info|$SUSEDIR/data|g" -e "s|/mounts/you/ftp|/media/dvdrecorder|g" $i > $TOPDIR$BINDIR/$(basename $i) + sed -e "s|/work/abuild/lib/abuild|$MODULEDIR|g" \ + -e "s|/work/abuild|$SUSEDIR|g" \ + -e "s|/work/cd/bin/tools|$BINDIR|g" \ + -e "s|/work/cd|$SUSEDIR|g" \ + -e "s|/work/src/bin|$SUSEDIR|g" \ + -e "s|/work/built/info|$SUSEDIR/data|g" \ + -e "s|/mounts/you/ftp|/media/dvdrecorder|g" \ + $i > $TOPDIR$BINDIR/$(basename $i) chmod 755 $TOPDIR$BINDIR/$(basename $i) done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org