Hello community, here is the log from the commit of package inst-source-utils checked in at Thu Oct 16 20:08:05 CEST 2008. -------- --- inst-source-utils/inst-source-utils.changes 2008-10-16 15:00:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2008-10-16 17:55:09.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 16 17:54:47 CEST 2008 - lrupp@suse.de + +- create_sha1sums: + + also put the GPG key in each slideshow directory + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.Tx9811/_old 2008-10-16 20:07:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Tx9811/_new 2008-10-16 20:07:27.000000000 +0200 @@ -26,7 +26,7 @@ Provides: autoyast2-utils = 2.14.10 Summary: Utilities for creating customized installation sources Version: 2008.10.16 -Release: 1 +Release: 2 Source: inst-source-utils.tar.bz2 Source1: split.pl BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,6 +60,9 @@ %_datadir/%name %changelog +* Thu Oct 16 2008 lrupp@suse.de +- create_sha1sums: + + also put the GPG key in each slideshow directory * Thu Oct 16 2008 ro@suse.de - create_package_descr: + add "-V" option to also put the vendor for each rpm in ++++++ inst-source-utils.tar.bz2 ++++++ 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-10-09 17:51:41.000000000 +0200 +++ new/inst-source-utils/usr/bin/create_sha1sums 2008-10-16 20:07:15.000000000 +0200 @@ -106,8 +106,6 @@ create_sha1sum --quiet "$SLIDESHOWDIR" for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do signit "$sha1sumfile" - # XXXX: check if this is needed - create_directory.yast $(dirname "$sha1sumfile") done fi @@ -145,6 +143,13 @@ if [ x"$REPOFILE" != x"" ] ; then cp -a $KEY_FILE $CDS_PRIM/$REPOFILE.key fi + if [ -n "$SLIDESHOWDIR" ]; then + for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do + cp -a $KEY_FILE ${sha1sumfile}.key + # XXXX: check if this is needed + create_directory.yast $(dirname "$sha1sumfile") + done + fi else echo "ERROR: Could not find public key file for $CDS_PRIM/pubring.gpg in $CDS_PRIM/gpg-pubkey-*" >&2 fi ++++++ pre_checkin.sh ++++++ --- inst-source-utils/pre_checkin.sh 2008-10-09 17:57:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/inst-source-utils/pre_checkin.sh 2008-10-16 17:54:16.000000000 +0200 @@ -19,18 +19,21 @@ #copy binaries for i in $BINFILES ; do - 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` - chmod 755 $TOPDIR$BINDIR/`basename $i` + 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) + chmod 755 $TOPDIR$BINDIR/$(basename $i) done # needed perl module for i in /mounts/work/abuild/lib/abuild/modules/RPMQ.pm ; do - sed -e "s|/work/abuild|$BINDIR|g" $i > $TOPDIR$MODULEDIR/modules/`basename $i` + echo "Preparing: $(basename $i)" + sed -e "s|/work/abuild|$BINDIR|g" $i > $TOPDIR$MODULEDIR/modules/`basename $i` done chmod 644 $TOPDIR$MODULEDIR/modules/*.pm # extra sed for scripts using the perl modules for i in create_package_descr ; do + echo "Preparing: $(basename $i)" sed -e "s|$BINDIR/lib/abuild|$MODULEDIR|g" $TOPDIR$BINDIR/$i > $TOPDIR$BINDIR/$i.tmp mv $TOPDIR$BINDIR/$i.tmp $TOPDIR$BINDIR/$i chmod 755 $TOPDIR$BINDIR/$i @@ -46,4 +49,5 @@ pushd $TMPDIR >/dev/null tar cjfp ../inst-source-utils.tar.bz2 inst-source-utils popd >/dev/null +cp -v $TMPDIR/../inst-source-utils.tar.bz2 . test "$TMPDIR" != "/" -a -d "$TMPDIR" && rm -rf $TMPDIR ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org