[Frugalware-git] bmf: pacman-g2-3.6.6.6.g3a1c159-1-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=38f28d218bc8d6bc1e2b5b6fa3f01d2c32b8d6b6

commit 38f28d218bc8d6bc1e2b5b6fa3f01d2c32b8d6b6
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Jan 3 17:51:46 2008 +0100

pacman-g2-3.6.6.6.g3a1c159-1-i686
update to newer snapshot
basically because i want to test the pre_upgrade scriptlet

diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild
index 389e229..7ba0dd9 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -4,8 +4,8 @@
USE_DEVEL=${USE_DEVEL:-"y"}

pkgname=pacman-g2
-pkgver=3.6.5
-Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac
+pkgver=3.6.6
+Fuse $USE_DEVEL && pkgver=3.6.6.6.g3a1c159
pkgrel=1
pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/"
@@ -27,7 +27,7 @@ else
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
Finclude scm
fi
-options=('scriptlet' 'nobuild')
+options=('scriptlet')

build()
{
diff --git a/source/base/pacman-g2/pacman-g2.install b/source/base/pacman-g2/pacman-g2.install
index b8efaf3..6d2a8df 100644
--- a/source/base/pacman-g2/pacman-g2.install
+++ b/source/base/pacman-g2/pacman-g2.install
@@ -1,3 +1,8 @@
+post_install()
+{
+	post_upgrade
+}
+
post_upgrade()
{
# this can be removed after 0.8 is out
@@ -8,10 +13,12 @@ post_upgrade()
if [ -e /etc/pacman.d -a ! -h /etc/pacman.d ]; then
mv -f /etc/pacman.d/* /etc/pacman-g2/repos/
rmdir /etc/pacman.d
-		ln -s /etc/pacman-g2/repos /etc/pacman.d
+	fi
+	if [ ! -h /etc/pacman.d ]; then
+		ln -s pacman-g2/repos /etc/pacman.d
fi
if grep -q 'etc/pacman\.d' /etc/pacman-g2.conf; then
-		sed -i 's|etc/pacman\.d|etc/pacman-g2/repos|' etc/pacman-g2.conf
+		sed -i 's|etc/pacman\.d|etc/pacman-g2/repos|' /etc/pacman-g2.conf
fi
if [ -e /var/cache/pacman -a ! -h /var/cache/pacman ]; then
mv /var/cache/pacman{,-g2}