SPECS: XFree86.spec - updated PLD patch to use system fontconfig -...

[qboosh]

Author: qboosh                       Date: Thu Jul 20 06:00:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated PLD patch to use system fontconfig
- fixed page_h and Xwrapper patches, removed Xwrapper2,imakefile patches
- added freetype-nointernals patch to fix build with freetype 2.2.x

---- Files affected:
SPECS:
   XFree86.spec (1.624 -> 1.625) 

---- Diffs:

================================================================
Index: SPECS/XFree86.spec
diff -u SPECS/XFree86.spec:1.624 SPECS/XFree86.spec:1.625
--- SPECS/XFree86.spec:1.624	Wed Jul 19 19:26:47 2006
+++ SPECS/XFree86.spec	Thu Jul 20 08:00:46 2006
@@ -121,6 +121,7 @@
 # Small (maybe buggy) patch to resolve problems with totem 0.97.0
 Patch46:	%{name}-lock.patch
 Patch47:	%{name}-sparc-kbd.patch
+Patch48:	%{name}-freetype-nointernals.patch
 Patch50:	%{name}-xterm-256colors.patch
 Patch52:	%{name}-kernel_headers.patch
 Patch53:	%{name}-stdint.patch
@@ -129,8 +130,6 @@
 Patch56:	%{name}-exec-shield-GNU-stack.patch
 Patch57:	%{name}-libGL-exec-shield-fixes-v2.patch
 Patch58:	%{name}-page_h.patch
-Patch59:	%{name}-Xwrapper2.patch
-Patch60:	%{name}-imakefile.patch
 URL:		http://www.xfree86.org/
 BuildRequires:	/usr/bin/perl
 # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
@@ -1840,6 +1839,7 @@
 %patch45 -p1
 %patch46 -p0
 %patch47 -p1
+%patch48 -p1
 %patch50 -p0
 %patch52 -p1
 %patch53 -p0
@@ -1848,8 +1848,6 @@
 #%patch56 -p0   -- check it
 #%patch57 -p0   -- obsoleted ?
 %patch58 -p0
-%patch59 -p0
-%patch60 -p0
 
 rm -f xc/config/cf/host.def
 
@@ -2008,15 +2006,8 @@
 install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_lib}.conf
 
-# kill some stuff for cleaner build
-# (fontconfig packaged separately, DRM already in kernel)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontconfig.pc \
-	$RPM_BUILD_ROOT%{_mandir}/{man3/fontconfig.3x,man1/fc-{cache,list}.1x} \
-	$RPM_BUILD_ROOT%{_libdir}/libfontconfig.* \
-	$RPM_BUILD_ROOT%{_includedir}/fontconfig \
-	$RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/fonts \
-	$RPM_BUILD_ROOT%{_prefix}/src
+# kill some stuff for cleaner build (DRM already in kernel)
+rm -rf	$RPM_BUILD_ROOT%{_prefix}/src
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -3215,6 +3206,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.625  2006/07/20 06:00:46  qboosh
+- updated PLD patch to use system fontconfig
+- fixed page_h and Xwrapper patches, removed Xwrapper2,imakefile patches
+- added freetype-nointernals patch to fix build with freetype 2.2.x
+
 Revision 1.624  2006/07/19 17:26:47  shadzik
 - add Xwrapper to package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/XFree86.spec?r1=1.624&r2=1.625&f=u