Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16b4d1ac29d497d96e0e4f6d63d28aba974b8509
commit 16b4d1ac29d497d96e0e4f6d63d28aba974b8509
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu Dec 27 17:05:08 2007 +0100
pacman-g2-3.6.6-3-i686
fix previous commit, post_install should be the same as post_upgrade
diff --git a/source/base/pacman-g2/FrugalBuild
b/source/base/pacman-g2/FrugalBuild
index 7528261..38dbc28 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=pacman-g2
pkgver=3.6.6
Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac
-pkgrel=2
+pkgrel=3
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/";
backup=(etc/{makepkg,pacman}.conf
etc/pacman-g2/repos/{frugalware,frugalware-current})
diff --git a/source/base/pacman-g2/pacman-g2.install
b/source/base/pacman-g2/pacman-g2.install
index b1ff7d6..c9de267 100644
--- a/source/base/pacman-g2/pacman-g2.install
+++ b/source/base/pacman-g2/pacman-g2.install
@@ -1,10 +1,6 @@
post_install()
{
- # this can be removed after 0.8 is out
- ln -s pacman-g2.conf /etc/pacman.conf
- ln -s /etc/pacman-g2/repos /etc/pacman.d
- ln -s pacman-g2 /var/cache/pacman
- ln -s pacman-g2 /var/lib/pacman
+ post_upgrade
}
post_upgrade()
@@ -17,10 +13,10 @@ 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
+ 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}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
