diff --git a/inst-source-utils.changes b/inst-source-utils.changes index 3982331..dd8e152 100644 --- a/inst-source-utils.changes +++ b/inst-source-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 16 17:54:47 CEST 2008 - lrupp@suse.de + +- create_sha1sums: + + also put the GPG key in each slideshow directory + ------------------------------------------------------------------- Thu Oct 16 15:00:19 CEST 2008 - ro@suse.de diff --git a/inst-source-utils.spec b/inst-source-utils.spec index 1f0295a..21fe614 100644 --- a/inst-source-utils.spec +++ b/inst-source-utils.spec @@ -26,7 +26,7 @@ Obsoletes: autoyast2-utils <= 2.14.10 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 @@ rm -rf %{buildroot} %_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 diff --git a/inst-source-utils.tar.bz2 b/inst-source-utils.tar.bz2 index 2ac132e..b9c8ca7 100644 --- a/inst-source-utils.tar.bz2 +++ b/inst-source-utils.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ef483c054f91ef01a17926039f7c4641359711407af506d13183544910c35d2 -size 25529 +oid sha256:6ce0e1fb54d486ead7175753d8473383fbc7ae8c77098d810c4f7b8a0b10846e +size 25498 diff --git a/pre_checkin.sh b/pre_checkin.sh index 72434b4..eec6dec 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -19,18 +19,21 @@ mkdir -p $TOPDIR$MODULEDIR/modules #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 @@ done 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