- fixed SU and XDMAUTHDIR substitution in xdm-config

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index 8f48a28d5ddcfb3497e546c14ff41154320d7b10..da6f736e89902d36ff59b8a01f348f992c9a4192 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -1,7 +1,6 @@
 #
 # TODO:
 # - separate XFS to be standalone - is it possible without duplicated files?
-# - fix Xwrapper and this ugly page.h hack
 # - unpacked files
 #
 # Conditional build:
@@ -22,7 +21,7 @@ Summary(uk):  
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
 Version:       4.6.0
-Release:       0.1
+Release:       0.2
 Epoch:         1
 License:       XFree86 1.1
 Group:         X11
@@ -121,6 +120,7 @@ Patch45:    %{name}-spencode-nowarning.patch
 # 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,7 +129,6 @@ Patch55:    %{name}-elfloader-linux-non-exec-stack.patch
 Patch56:       %{name}-exec-shield-GNU-stack.patch
 Patch57:       %{name}-libGL-exec-shield-fixes-v2.patch
 Patch58:       %{name}-page_h.patch
-Patch59:       %{name}-Xwrapper2.patch
 URL:           http://www.xfree86.org/
 BuildRequires: /usr/bin/perl
 # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
@@ -1795,7 +1794,7 @@ System. 
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p0   -- TODO: make it somehow work
+%patch3 -p0
 %patch4 -p1
 %patch5 -p0
 %patch6 -p0
@@ -1839,6 +1838,7 @@ System. 
 %patch45 -p1
 %patch46 -p0
 %patch47 -p1
+%patch48 -p1
 %patch50 -p0
 %patch52 -p1
 %patch53 -p0
@@ -1847,7 +1847,6 @@ System. 
 #%patch56 -p0   -- check it
 #%patch57 -p0   -- obsoleted ?
 %patch58 -p0
-#%patch59 -p0   -- same as patch3, make it work !
 
 rm -f xc/config/cf/host.def
 
@@ -2006,15 +2005,8 @@ gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.*
 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
@@ -2404,7 +2396,7 @@ fi
 
 %files Xserver
 %defattr(644,root,root,755)
-#%attr(4755,root,root) %{_bindir}/Xwrapper
+%attr(4755,root,root) %{_bindir}/Xwrapper
 %attr(755,root,root) %{_bindir}/XFree86
 %attr(755,root,root) %{_bindir}/getconfig*
 %attr(755,root,root) %{_sysconfdir}/X11/X