Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=022ce75e414abfdbda0a6952d29853ab6d24d74e

commit 022ce75e414abfdbda0a6952d29853ab6d24d74e
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Aug 6 12:06:22 2010 +0000

xorg-server-1.8.2-8-i686
*fixed .install
*don't create symlink and delete it
Ã*and inform the user if find old dir location

diff --git a/source/x11/xorg-server/FrugalBuild 
b/source/x11/xorg-server/FrugalBuild
index b8ff29c..b259119 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -10,7 +10,7 @@ USE_MULTIBUFFER=${USE_MULTIBUFFER:-"n"}

pkgname=xorg-server
pkgver=1.8.2
-pkgrel=7
+pkgrel=8
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
diff --git a/source/x11/xorg-server/xorg-server.install 
b/source/x11/xorg-server/xorg-server.install
index ff7220c..dfa275e 100644
--- a/source/x11/xorg-server/xorg-server.install
+++ b/source/x11/xorg-server/xorg-server.install
@@ -13,12 +13,22 @@ post_upgrade()

pre_upgrade()
{
-       #delete old fonts cache and create a symlink for compatibility xorg.conf
-       if ! [ -h "/usr/lib/X11/fonts" ];then
-               echo "Create symlink fonts"
-               #if some fonts are not rebuild or build manually we moved it
-               mv /usr/lib/X11/fonts /usr/lib/X11/fonts.backup
-               ln -sf /usr/share/fonts/X11 /usr/lib/X11/fonts
+       #fix buggy xorg-server 1.8.2-7
+       #delete useless symlink
+       if [ -h "/usr/lib/X11/fonts" ];then
+               #delete bugguy symlink
+               rm /usr/lib/X11/fonts
+       fi
+       #restor useless backup
+       if [ -d "/usr/lib/X11/fonts.backup" ];then
+               mv /usr/lib/X11/fonts.backup /usr/lib/X11/fonts
+       fi
+       #end fix buggy xorg-server 1.8.2-7
+
+       #inform user : the old dir font is ignored
+       if [ -d "/usr/lib/X11/fonts" ];then
+               echo "Xorg ignore /usr/lib/X11/fonts"
+               echo "You should install the fonts into /usr/share/fonts/X11/"
fi
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to