Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e512edd3e999d1c0ad5028e2665915c507c6742

commit 8e512edd3e999d1c0ad5028e2665915c507c6742
Author: Elentir <elen...@mailoo.org>
Date:   Wed Feb 10 13:39:21 2010 +0100

xorg-server-minimal-1.7.4-2-i686

* move files to avoid file conflicts
* drop conflicts

diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild 
b/source/x11-extra/xorg-server-minimal/FrugalBuild
index 247083c..98fb731 100644
--- a/source/x11-extra/xorg-server-minimal/FrugalBuild
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=xorg-server-minimal
_F_xorg_name=xorg-server
pkgver=1.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org X Server for Fwife Install CD"
groups=('x11-extra')
archs=('i686' 'x86_64' )
@@ -15,7 +15,6 @@ makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3' 
'fixesproto' 'damageproto>
'xf86dgaproto' 'compositeproto>=0.4' 'resourceproto' 'videoproto>=2.2.2' 
'scrnsaverproto' 'evieext' \
'fontsproto' 'kbproto' 'inputproto>=1.5' 'bigreqsproto' 'xcmiscproto' 
'xextproto>=7.0.99.3' \
'fontcacheproto' 'util-macros>=1.2.1')
-conflicts=('xorg-server')
Finclude xorg
## fix up2date by grepv'ing the beta and other weird version number
up2date="lynx -dump $_F_xorg_url | grep -v '1.7.99' | grep -v '902' | grep -v 
'901' | Flasttar"
@@ -33,4 +32,14 @@ Fconfopts="$Fconfopts --enable-install-setuid \
--with-xkb-path=/usr/lib/X11/xkb --disable-xnest \
--disable-dbe"

+build() {
+       Fbuild
+       # move files to avoid conflicts and the installer can move them back to 
/
+       Fmkdir fwifecdbin/
+       Fmv usr fwifecdbin/
+       Fmv var fwifecdbin/
+       Fmkdir usr/lib/
+       Fmv fwifecdbin usr/lib/
+}
+
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to