Sun Oct 30 01:19:30 CEST 2005 VMiklos <[EMAIL PROTECTED]> * pacman-2.9.7-15-i686 -chroot.diff: copy back the buildlog if -k used -rodepends.diff: added update/gensync support diff -rN -u old-frugalware-current/source/base/pacman/FrugalBuild new-frugalware-current-1/source/base/pacman/FrugalBuild --- old-frugalware-current/source/base/pacman/FrugalBuild 2005-10-30 12:48:33.000000000 +0100 +++ new-frugalware-current-1/source/base/pacman/FrugalBuild 2005-10-30 12:11:37.000000000 +0100 @@ -1,10 +1,10 @@ -# Last Modified: Fri, 28 Oct 2005 01:47:27 +0200 +# Last Modified: Sun, 30 Oct 2005 01:14:41 +0200 # Compiling Time: 0.10 SBU # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=pacman pkgver=2.9.7 -pkgrel=14 +pkgrel=15 pkgdesc="A .tar.bz2 based package manager with dependency support" url="http://www.archlinux.org/pacman"; backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current,extra,extra-current}) @@ -59,11 +59,11 @@ 'b569a9779a3a08983d7b99d2cd856665c008d113' \ '9414e9c2d685377852ece6559f703d53d141684f' \ 'b9a032de48cc38ffc8a427045be8bccfa82e5f02' \ - 'bebd2f317f3c8c9d1b1d52441986e0353e112879' \ + '7c57c3a2b5043bc8b0d405a7e5a102d562fcfd16' \ '5d8cb60af2c8a069905dcd7bb3dfb2224545b42d' \ '0bf221baa04e2f623ec1a68f8ce92f01ea2745eb' \ 'dcb206f7ea1416a0fd8082150ec70b946a069c49' \ - '71564afa7cac81127627fa1447c0edd6817afdf8' \ + '28fefb3c8f44624b242596b5ee7ad50218537b55' \ '5c20c8486d239b1f488cf165318cb85319fe5227' \ '0d982a46ebe9ca49b83f71668a5e0567de00c9cd' \ '9ec5ce0f7d9be552fee75ed7bf001285e198e3d2' \ diff -rN -u old-frugalware-current/source/base/pacman/pacman-2.9.7-chroot.diff new-frugalware-current-1/source/base/pacman/pacman-2.9.7-chroot.diff --- old-frugalware-current/source/base/pacman/pacman-2.9.7-chroot.diff 2005-10-30 12:48:33.000000000 +0100 +++ new-frugalware-current-1/source/base/pacman/pacman-2.9.7-chroot.diff 2005-10-30 12:11:37.000000000 +0100 @@ -235,7 +235,7 @@ exit 0 else error "You must be root to clean the cache." -@@ -436,6 +506,113 @@ +@@ -436,6 +506,117 @@ fi fi @@ -337,6 +337,10 @@ + fi + # copy back the buildscript, maybe modified + cp $CHROOTDIR/var/tmp/fst/FrugalBuild ./ ++ # save the build log if necessary ++ if [ -f $CHROOTDIR/var/tmp/fst/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log ]; then ++ mv $CHROOTDIR/var/tmp/fst/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log ./ ++ fi + rm -rf $CHROOTDIR/var/tmp/fst/* + chroot_clean + fi diff -rN -u old-frugalware-current/source/base/pacman/pacman-2.9.7-rodepends.diff new-frugalware-current-1/source/base/pacman/pacman-2.9.7-rodepends.diff --- old-frugalware-current/source/base/pacman/pacman-2.9.7-rodepends.diff 2005-10-30 12:48:33.000000000 +0100 +++ new-frugalware-current-1/source/base/pacman/pacman-2.9.7-rodepends.diff 2005-10-30 12:11:37.000000000 +0100 @@ -43,3 +43,33 @@ for it in "[EMAIL PROTECTED]"; do echo "remove = $it" >>.PKGINFO done +diff -Naur pacman-2.9.7.orig/scripts/gensync pacman-2.9.7/scripts/gensync +--- pacman-2.9.7.orig/scripts/gensync 2005-10-30 01:07:33.000000000 +0200 ++++ pacman-2.9.7/scripts/gensync 2005-10-30 01:05:22.000000000 +0200 +@@ -143,9 +143,9 @@ + fi + # depends + : >depends +- if [ ${#depends[*]} -gt 0 ]; then ++ if [ ${#depends[*]} -gt 0 -o ${#rodepends[*]} -gt 0 ]; then + echo "%DEPENDS%" >>depends +- for it in "[EMAIL PROTECTED]"; do ++ for it in "[EMAIL PROTECTED]" "[EMAIL PROTECTED]"; do + echo "$it" >>depends + done + echo "" >>depends +diff -Naur pacman-2.9.7.orig/scripts/updatesync pacman-2.9.7/scripts/updatesync +--- pacman-2.9.7.orig/scripts/updatesync 2005-10-30 01:07:33.000000000 +0200 ++++ pacman-2.9.7/scripts/updatesync 2005-10-30 01:05:26.000000000 +0200 +@@ -146,9 +146,9 @@ + fi + # depends + : >depends +- if [ ${#depends[*]} -gt 0 ]; then ++ if [ ${#depends[*]} -gt 0 -o ${#rodepends[*]} -gt 0 ]; then + echo "%DEPENDS%" >>depends +- for it in "[EMAIL PROTECTED]"; do ++ for it in "[EMAIL PROTECTED]" "[EMAIL PROTECTED]"; do + echo "$it" >>depends + done + echo "" >>depends
_______________________________________________ Frugalware-darcs mailing list Frugalware-darcs@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-darcs
