-diff -Nru xc.orig/Makefile xc/Makefile
---- xc.orig/Makefile 2003-11-02 05:38:01.000000000 +0100
-+++ xc/Makefile 2003-12-23 12:09:12.071230112 +0100
-@@ -8,7 +8,7 @@
- # or add "MAKE = make" to this file.
-
- RELEASE = "Release 6.7"
--SHELL = /bin/sh
-+SHELL = /bin/sh -e
- RM = rm -f
- MV = mv
- WORLDOPTS =
-diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf
---- xc.orig/config/cf/Imake.cf 2003-12-19 05:40:33.000000000 +0100
-+++ xc/config/cf/Imake.cf 2003-12-23 12:09:11.983243488 +0100
-@@ -784,6 +784,10 @@
+--- xc/config/cf/Imake.cf.wiget 2004-08-11 23:14:01.000000000 +0200
++++ xc/config/cf/Imake.cf 2004-09-09 16:16:53.093467589 +0200
+@@ -805,6 +805,10 @@
# define s390Architecture
# undef __s390__
# endif /* s390 */
# ifdef __alpha
# define AlphaArchitecture
# undef __alpha
-diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
---- xc.orig/config/cf/Imake.tmpl 2003-11-21 06:55:02.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2003-12-23 12:09:11.992242120 +0100
-@@ -261,7 +261,7 @@
+--- xc/config/cf/Imake.tmpl.wiget 2004-07-28 05:24:29.000000000 +0200
++++ xc/config/cf/Imake.tmpl 2004-09-09 16:16:53.116463078 +0200
+@@ -262,7 +262,7 @@
#ifndef BuildHtmlManPages
#ifdef RmanCmd
#else
#define BuildHtmlManPages NO
#endif
-@@ -854,11 +854,7 @@
+@@ -863,11 +863,7 @@
#define LintlibDir $(USRLIBDIR)/lint
#endif
#ifndef SystemManDirectory
#endif
#ifndef ManDirectoryRoot
#ifdef ProjectRoot
-@@ -998,7 +994,7 @@
- #define NoRConst NO /* YES if const for structs of funcs is bad */
- #endif
- #ifndef InstPgmFlags
--#define InstPgmFlags -s
-+#define InstPgmFlags
- #endif
- #ifndef InstBinFlags
- #define InstBinFlags -m 0755
-@@ -1140,7 +1136,7 @@
+@@ -1171,7 +1167,7 @@
#define CppCmd /LibDirName/cpp
#endif
#ifndef RawCppCmd
#endif
#ifndef CppNoLineInfoOption
#define CppNoLineInfoOption /**/
-diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.orig/config/cf/X11.tmpl 2003-12-19 05:41:17.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2003-12-23 12:09:12.042234520 +0100
-@@ -1262,8 +1262,12 @@
+--- xc/config/cf/linux.cf.wiget 2004-08-11 23:14:01.000000000 +0200
++++ xc/config/cf/linux.cf 2004-09-09 16:16:53.123461705 +0200
+@@ -368,7 +368,7 @@
+ */
+ #if BuildXF86DRI
+ # if defined(i386Architecture)
+-# define BuildLibGlxWithoutPIC YES
++# define BuildLibGlxWithoutPIC NO
+ # endif
+ #endif
+
+@@ -757,7 +757,7 @@
+
+ #define HasVarRun YES
+ #ifndef VarDbDirectory
+-# define VarDbDirectory $(VARDIR)/lib
++# define VarDbDirectory /var/lib
+ #endif
+
+ #ifndef XF86OSCardDrivers
+--- xc/config/cf/site.def.wiget 2004-05-06 17:08:25.000000000 +0200
++++ xc/config/cf/site.def 2004-09-09 16:16:53.129460529 +0200
+@@ -119,10 +119,14 @@
+ #define HasSentinel YES
+ */
+
+-/*
+ #undef DefaultUserPath
+-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
+-*/
++#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
++#undef DefaultSystemPath
++#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
++
++
++#define HasPam YES
++#define HasPamMisc YES
+
+
+ /* You do NOT need SetUID if you only run the server under xdm */
+--- xc/config/cf/X11.tmpl.wiget 2004-09-03 18:18:18.000000000 +0200
++++ xc/config/cf/X11.tmpl 2004-09-09 16:16:53.172452095 +0200
+@@ -715,7 +715,7 @@
+ #endif
+
+ #ifndef InstallHardcopyDocs
+-#define InstallHardcopyDocs YES
++#define InstallHardcopyDocs NO
+ #endif
+
+ #ifndef InstallMiscManPages
+@@ -1398,8 +1398,12 @@
# define UsbMouseSupport NO
#endif
+#define DefaultFSConfigFile $(ETCX11DIR)/fs/config
#endif
- /* X-TrueType settings */
-@@ -1389,7 +1393,7 @@
+ #ifndef BinDir
+@@ -1486,7 +1490,7 @@
#define ConfigDir $(LIBDIR)/config
#endif
#ifndef DocDir
#endif
#ifndef DocHtmlDir
#define DocHtmlDir $(DOCDIR)/html
-@@ -1401,31 +1405,31 @@
+@@ -1498,31 +1502,31 @@
#define DocPdfDir $(DOCDIR)/PDF
#endif
#ifndef FontDir
#endif
#ifndef NlsDir
#define NlsDir $(LIBDIR)/nls
-@@ -1434,23 +1438,20 @@
+@@ -1531,23 +1535,20 @@
#define XLocaleDir $(LIBDIR)/locale
#endif
#ifndef LbxproxyDir
#ifndef InstallSecurityConfig
#define InstallSecurityConfig YES /* Install sample security policy */
#endif
-@@ -1482,10 +1483,10 @@
+@@ -1579,10 +1580,10 @@
#define OsNameDefines /* as nothing */
#endif
#ifndef DefaultUserPath /* for xdm */
#endif
#ifndef DefaultSystemShell /* for xdm to set in SHELL */
#define DefaultSystemShell BourneShell
-@@ -1614,7 +1615,7 @@
+@@ -1719,7 +1720,7 @@
HTMLINDEXCMD = HtmlIndexCmd
CLIENTSRC = $(TOP)/clients
DEMOSRC = $(TOP)/demos
XDOCMACROS = $(DOCUTILSRC)/macros.t
-@@ -1628,7 +1629,7 @@
+@@ -1733,7 +1734,7 @@
SERVERSRC = $(XTOP)/programs/Xserver
CONTRIBSRC = ContribDir
UNSUPPORTEDSRC = UnsupportedDir
RGBSRC = $(XTOP)/programs/rgb
BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
---- xc.orig/config/cf/linux.cf 2003-12-19 05:41:59.000000000 +0100
-+++ xc/config/cf/linux.cf 2003-12-23 12:09:12.008239688 +0100
-@@ -333,7 +333,7 @@
- */
- #if BuildXF86DRI
- # if defined(i386Architecture)
--# define BuildLibGlxWithoutPIC YES
-+# define BuildLibGlxWithoutPIC NO
- # endif
+--- xc/config/cf/xorg.cf.wiget 2004-09-04 00:00:10.000000000 +0200
++++ xc/config/cf/xorg.cf 2004-09-09 16:16:53.189448761 +0200
+@@ -142,7 +142,7 @@
+ #define XConfigFile xorg.conf
#endif
-
-@@ -720,7 +720,7 @@
-
- #define HasVarRun YES
- #ifndef VarDbDirectory
--# define VarDbDirectory $(VARDIR)/lib
-+# define VarDbDirectory /var/lib
+ #ifndef XConfigDir
+-#define XConfigDir $(LIBDIR)
++#define XConfigDir $(ETCX11DIR)
#endif
-
- #ifndef XF86OSCardDrivers
-diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def
---- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100
-+++ xc/config/cf/site.def 2003-12-23 12:09:12.014238776 +0100
-@@ -119,10 +119,14 @@
- #define HasSentinel YES
- */
-
--/*
- #undef DefaultUserPath
--#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
--*/
-+#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR)
-+#undef DefaultSystemPath
-+#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR)
-+
-+
-+#define HasPam YES
-+#define HasPamMisc YES
-
-
- /* You do NOT need SetUID if you only run the server under xdm */
-diff -urN xc.org/config/cf/xorgsite.def xc/config/cf/xorgsite.def
---- xc.org/config/cf/xorgsite.def 2004-04-02 23:47:10.000000000 +0200
-+++ xc/config/cf/xorgsite.def 2004-04-19 01:01:24.744961760 +0200
-@@ -260,8 +261,8 @@
+ #ifndef XLogFile
+ #define XLogFile Xorg
+@@ -409,7 +409,7 @@
+ neomagic i740 tdfx savage \
+ cirrus vmware tseng trident chips apm \
+ GlideDriver i128 i386Drivers \
+- ati DevelDrivers ark \
++ ati DevelDrivers ark fbdev \
+ cyrix siliconmotion via \
+ vesa vga \
+ dummy XF86OSCardDrivers XF86ExtraCardDrivers
+--- xc/config/cf/xorgsite.def.wiget 2004-08-21 04:06:44.000000000 +0200
++++ xc/config/cf/xorgsite.def 2004-09-09 16:16:53.193447976 +0200
+@@ -264,8 +264,8 @@
/*
* To not build/install the Cyrillic fonts, uncomment the following
*
/*
* To not install the local font directory, uncomment the following
-@@ -307,20 +308,20 @@
- * HasGlide2 to YES and set the Glide2IncDir variable.
- * HasGlide2 is per default NO.
- *
--#define HasGlide2 YES
- */
-+#define HasGlide2 YES
-
- /*
- * Set the path to your Glide include files.
- *
--#define Glide2IncDir /usr/include/glide
- */
-+#define Glide2IncDir /usr/include/glide
-
- /*
- * Have glide 3?
- *
--#define HasGlide3 YES
- */
-+#define HasGlide3 YES
-
- /*
- * Set the path to your Glide 3 include files.
-@@ -429,8 +430,8 @@
+@@ -433,8 +433,8 @@
* Some Linux releases don't have a libtermcap. In this case you may need
* to uncomment the following
*
/*
* Build a server that dynamically loads the modules by setting
-@@ -582,8 +583,8 @@
- /*
- * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.
- *
--#define HasXdmAuth YES
- */
-+#define HasXdmAuth YES
-
- /*
- * If you have Linux DECnet support, and want to build XFree86 with support
-@@ -605,8 +606,8 @@
+@@ -610,8 +610,8 @@
* To forceably build static libraries in addition to shared libraries,
* uncomment this.
*
/*
* Uncomment this if your default tools (eg, gcc, ld, as, etc) are
-diff -Nru xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
---- xc.orig/config/cf/xorg.cf 2003-11-21 06:55:07.000000000 +0100
-+++ xc/config/cf/xorg.cf 2003-12-23 12:09:12.055232544 +0100
-@@ -128,7 +128,7 @@
- #define XConfigFile XF86Config
- #endif
- #ifndef XConfigDir
--#define XConfigDir $(LIBDIR)
-+#define XConfigDir $(ETCX11DIR)
- #endif
- #ifndef XLogFile
- #define XLogFile XFree86
-@@ -760,7 +760,7 @@
-
- # ifndef XF86CardDrivers
- # define XF86CardDrivers mga glint nv s3 s3virge sis savage \
-- trident chips tdfx fbdev ati \
-+ trident chips fbdev ati \
- DevelDrivers newport \
- XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
-diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c
---- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200
-+++ xc/config/imake/imake.c 2003-12-23 12:09:12.060231784 +0100
+--- xc/config/imake/imake.c.wiget 2004-06-11 19:59:30.000000000 +0200
++++ xc/config/imake/imake.c 2004-09-09 16:16:53.252436404 +0200
@@ -1057,6 +1057,7 @@
static char* suse = "/etc/SuSE-release";
static char* redhat = "/etc/redhat-release";
/* what's the definitive way to tell what any particular distribution is? */
fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile
---- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-19 05:48:39.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-23 12:09:12.000000000 +0100
-@@ -107,7 +107,7 @@
-
- #if HasNCurses
- CURSESLIB = NCursesLibName
--CURSESDEFINES = -DHAS_NCURSES
-+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
- #endif
-
- XF86CONFIGFILE = XConfigFile
-diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc.orig/programs/xdm/config/Xres.cpp 2003-11-21 07:01:06.000000000 +0100
-+++ xc/programs/xdm/config/Xres.cpp 2003-12-23 12:09:12.000000000 +0100
-@@ -71,9 +71,9 @@
+--- xc/programs/xdm/config/Xres.cpp.wiget 2004-04-23 21:54:43.000000000 +0200
++++ xc/programs/xdm/config/Xres.cpp 2004-09-09 16:16:53.261434639 +0200
+@@ -70,10 +70,10 @@
+ #endif /* XPM */
XHASHendif
#ifdef XPM
-XHASHif PLANES >= 8
XHASHendif
xlogin*useShape: true
xlogin*logoPadding: 10
-diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c
---- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200
-+++ xc/programs/xdm/resource.c 2003-12-23 12:09:12.000000000 +0100
-@@ -84,31 +84,31 @@
+--- xc/programs/xdm/resource.c.wiget 2004-04-23 21:54:42.000000000 +0200
++++ xc/programs/xdm/resource.c 2004-09-09 16:16:53.264434051 +0200
+@@ -85,31 +85,31 @@
*/
#ifndef __EMX__
#ifndef DEF_SERVER_LINE
#endif
#ifndef DEF_AUTH_NAME
#ifdef HASXDMAUTH
-@@ -118,7 +118,7 @@
+@@ -119,7 +119,7 @@
#endif
#endif
#ifndef DEF_AUTH_DIR
#endif
#ifndef DEF_USER_AUTH_DIR
#define DEF_USER_AUTH_DIR "/tmp"
-diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile
---- xc.orig/programs/xinit/Imakefile 2003-11-21 07:01:12.000000000 +0100
-+++ xc/programs/xinit/Imakefile 2003-12-23 12:09:12.000000000 +0100
-@@ -46,11 +46,12 @@
+--- xc/programs/xinit/Imakefile.wiget 2004-04-23 21:54:49.000000000 +0200
++++ xc/programs/xinit/Imakefile 2004-09-09 16:16:53.265433855 +0200
+@@ -48,11 +48,12 @@
#endif
InstallManPage(startx,$(MANDIR))
LinkConfDirectory(xinit,.,xinit,.)
-diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc.orig/programs/xterm/Imakefile 2003-12-19 05:51:51.000000000 +0100
-+++ xc/programs/xterm/Imakefile 2003-12-23 12:11:05.000000000 +0100
+--- xc/programs/xterm/Imakefile.wiget 2004-08-13 14:57:19.000000000 +0200
++++ xc/programs/xterm/Imakefile 2004-09-09 16:16:53.267433462 +0200
@@ -36,6 +36,10 @@
#define XkbClientLibs /**/
#endif
@@ -116,7 +122,7 @@
XKB_DEFINES = XkbClientDefines
PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
- DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF) $(XVERSIONDEFS) $(VENDORDEFINES)
+ DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF)
- INCLUDES = -I. $(XRFINCLUDES)
+ INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES)
#ifdef OS2Architecture
MAINSRC = os2main.c
-diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h
---- xc.orig/programs/xterm/xterm.h 2003-12-19 05:51:52.000000000 +0100
-+++ xc/programs/xterm/xterm.h 2003-12-23 12:09:12.000000000 +0100
-@@ -73,7 +73,7 @@
+--- xc/programs/xterm/xterm.h.wiget 2004-08-13 14:57:21.000000000 +0200
++++ xc/programs/xterm/xterm.h 2004-09-09 16:16:53.269433070 +0200
+@@ -75,7 +75,7 @@
#endif
#ifndef DFT_TERMTYPE
#endif
#ifndef X_NOT_POSIX
+--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.wiget 2004-09-02 03:10:29.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2004-09-09 16:16:53.266433659 +0200
+@@ -110,7 +110,7 @@
+
+ #if HasNCurses
+ CURSESLIB = NCursesLibName
+-CURSESDEFINES = -DHAS_NCURSES
++CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses
+ #endif
+
+ XF86CONFIGFILE = XConfigFile
+--- xc/Makefile.wiget 2004-09-03 18:18:17.000000000 +0200
++++ xc/Makefile 2004-09-09 16:18:24.437548570 +0200
+@@ -8,7 +8,7 @@
+ # or add "MAKE = make" to this file.
+
+ RELEASE = "Release 6.8"
+-SHELL = /bin/sh
++SHELL = /bin/sh -e
+ RM = rm -f
+ MV = mv
+ WORLDOPTS =
+--- xc/config/cf/X11.tmpl.orig 2004-09-13 18:37:30.000000000 +0200
++++ xc/config/cf/X11.tmpl 2004-09-13 22:24:31.449334056 +0200
+@@ -2801,7 +2801,7 @@
+ #endif
+
+ #ifndef SharedLibXdmcp
+-#define SharedLibXdmcp NO
++#define SharedLibXdmcp YES
+ #endif
+ #ifndef NormalLibXdmcp
+ #define NormalLibXdmcp (!SharedLibXdmcp | ForceNormalLib)
+
+--- xc/config/cf/linux.cf.orig 2004-09-13 18:37:30.000000000 +0200
++++ xc/config/cf/linux.cf 2004-09-13 22:42:59.680857256 +0200
+@@ -502,6 +502,10 @@
+ # define HasExpat YES
+ #endif
+
++#ifndef HasFontconfig
++# define HasFontconfig YES
++#endif
++
+ #ifndef HasFreetype2
+ # define HasFreetype2 YES
+ #endif
+
+--- xc/config/cf/X11.tmpl.orig 2004-09-14 17:15:01.000000000 +0200
++++ xc/config/cf/X11.tmpl 2004-09-14 21:29:44.837063736 +0200
+@@ -2775,7 +2775,7 @@
+ #endif
+
+ #ifndef SharedLibXau
+-#define SharedLibXau NO
++#define SharedLibXau YES
+ #endif
+ #ifndef NormalLibXau
+ #define NormalLibXau (!SharedLibXau | ForceNormalLib)
+
#
-# TODO:
-# - separate XFS to be standalone - is it possible without duplicated files?
+# TODO
+# - XDM Auth broken (can anyone confirm now with new implementation?)
+# - Review Patch 46
+# - missing dir in Xprint (which one?)
#
# Conditional build:
%bcond_without glide # don't build glide driver
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
-Version: 6.7.0
-Release: 10
+Version: 6.8.1
+Release: 0.1
Epoch: 1
License: XFree86 1.0 (?)
Group: X11
-Source0: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src1.tar.gz
-# Source0-md5: 22465263bae7a2e9f5ad77e172cf1ab5
-Source1: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src2.tar.gz
-# Source1-md5: 6ef4e8f7647a28f080c10ea1bcf01f79
-Source2: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src3.tar.gz
-# Source2-md5: 4c7144786522bbce383b21ace72bf669
+Source0: http://freedesktop.org/~xorg/X11R%{version}/src/multiple/%{name}R%{version}-src1.tar.gz
+# Source0-md5: 4dc88cf5edaf000c75e314189f3def62
+Source1: http://freedesktop.org/~xorg/X11R%{version}/src/multiple/%{name}R%{version}-src2.tar.gz
+# Source1-md5: ca4af8de1278ea41b8484823ba9db9af
+Source2: http://freedesktop.org/~xorg/X11R%{version}/src/multiple/%{name}R%{version}-src3.tar.gz
+# Source2-md5: 99789cfa85ad3cf9c98b0e9e18dad90a
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
Source41: xconsole.png
Source42: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/XFree86-non-english-Xman-pages.tar.bz2
# Source42-md5: a184106bb83cb27c6963944d9243ac3f
-Source44: XFree86-Xserver-headers
+Source44: %{name}-Xserver-headers
Source45: XFree86-Xserver-headers-links
Source46: twm-xsession.desktop
Source47: xcalc.desktop
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf
Patch0: %{name}-PLD.patch
-Patch1: XFree86-HasZlib.patch
-Patch2: XFree86-DisableDebug.patch
+Patch1: %{name}-enableglide.patch
+Patch2: %{name}-DisableDebug.patch
Patch3: %{name}-Xwrapper.patch
-Patch4: XFree86-xfs.patch
-Patch5: XFree86-xfs-fix.patch
-Patch6: XFree86-xfs-logger.patch
-Patch7: XFree86-xterm-utempter.patch
-Patch8: XFree86-app_defaults_dir.patch
-Patch9: XFree86-v4l.patch
-Patch10: XFree86-broken-includes.patch
-Patch11: XFree86-alpha-pcibus-lemming.patch
-Patch12: XFree86-fhs.patch
-Patch13: XFree86-xdmsecurity.patch
-Patch14: XFree86-xman.patch
-Patch15: XFree86-HasXdmAuth.patch
-Patch16: XFree86-xdm-fixes.patch
-Patch17: XFree86-imake-kernel-version.patch
-Patch18: XFree86-no-kernel-modules.patch
-Patch19: XFree86-parallelmake.patch
-Patch20: XFree86-pic.patch
-Patch21: XFree86-r128-busmstr2.patch
-Patch22: XFree86-neomagic_swcursor.patch
-Patch23: XFree86-mga-busmstr.patch
-Patch24: XFree86-agpgart-load.patch
-Patch26: XFree86-HasFreetype2.patch
-Patch27: XFree86-config-s3.patch
-Patch28: XFree86-sparc_pci_domains.patch
-Patch29: XFree86-XTerm.ad.patch
-Patch30: XFree86-alpha_GLX_align_fix.patch
+Patch4: %{name}-xfs.patch
+Patch5: %{name}-xterm-utempter.patch
+Patch6: %{name}-app_defaults_dir.patch
+Patch7: %{name}-v4l.patch
+Patch8: %{name}-broken-includes.patch
+Patch9: %{name}-fhs.patch
+Patch10: %{name}-xdmsecurity.patch
+Patch11: %{name}-xman.patch
+Patch13: %{name}-xdm-fixes.patch
+Patch14: %{name}-pic.patch
+Patch15: %{name}-r128-busmstr2.patch
+Patch16: %{name}-neomagic_swcursor.patch
+Patch17: %{name}-mga-busmstr.patch
+Patch18: %{name}-agpgart-load.patch
+Patch20: %{name}-config-s3.patch
+Patch21: %{name}-XTerm.ad.patch
+Patch22: %{name}-xf86Pcih.patch
+Patch23: %{name}-dontbuildfonts.patch
+Patch25: %{name}-llh.patch
Patch32: XFree86-xman-manpaths.patch
Patch33: XFree86-clearrts.patch
-Patch34: XFree86-fix-07-s3trio64v2gx+netfinity.patch
-Patch35: XFree86-i740-driver-update-cvs-20020617.patch
-Patch36: XFree86-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch38: XFree86-tdfx-fix-compiler-warnings.patch
-Patch39: XFree86-tdfx-fix-vtswitch-font-corruption.patch
Patch40: XFree86-Xfont-Type1-large-DoS.patch
-# "strip -g libGLcore.a" leaves empty objects m_debug_*.o, which cause
-# warnings during GLcore loading ("m_debug_*.o: no symbols") - shut up them
-Patch41: XFree86-GLcore-strip-a-workaround.patch
-Patch42: %{name}-disable_glide.patch
-Patch43: XFree86-expat.patch
-Patch44: XFree86-pkgconfig.patch
-# spencode.o in libspeedo.a is empty - patch like for libGLcore.a
+Patch41: %{name}-GLcore-strip-a-workaround.patch
+Patch44: %{name}-pkgconfig.patch
Patch45: XFree86-spencode-nowarning.patch
-# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch46: XFree86-lock.patch
-Patch47: XFree86-sparc-kbd.patch
Patch50: %{name}-xterm-256colors.patch
-Patch52: XFree86-kernel_headers.patch
-Patch53: XFree86-stdint.patch
Patch54: %{name}-setxkbmap.patch
Patch55: %{name}-makefile-fastbuild.patch
Patch56: %{name}-xrender-pkgconfig.patch
%description common -l pl
Pliki XOrg X11 wymagane zarówno po stronie serwera jak i klienta.
+%package Xprint
+Summary: Xprint tool
+Summary(pl): Narzêdzie Xprint
+Group: X11
+# XXX: this dir doesn't exist
+Requires: /etc/X11/xserver
+
+%description Xprint
+Xprint tool.
+
+%description Xprint -l pl
+Narzêdzie Xprint.
+
%package DPS
Summary: Display PostScript
Summary(pl): Display PostScript
Summary(pl): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Provides: OpenGL = 1.4
+Provides: OpenGL = 1.5
Provides: OpenGL-GLU = 1.3
Provides: OpenGL-GLX = 1.4
Provides: XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: OpenGL-devel-base
-Provides: OpenGL-devel = 1.4
+Provides: OpenGL-devel = 1.5
Provides: OpenGL-GLU-devel = 1.3
Provides: OpenGL-GLX-devel = 1.4
Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
-Provides: OpenGL-static = 1.4
+Provides: OpenGL-static = 1.5
Provides: OpenGL-GLU-static = 1.3
Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-static
Provides: xft-devel = 2.1.6
Provides: xpm-devel
Provides: xrender-devel = 0.8.4
-#Provides: libXrender-devel = 0.8.4
-#Provides: libXft-devel = 2.1.6
-#Provides: libXcursor-devel = 1.1.2
-#Provides: libICE-devel
-#Provides: libSM-devel
-#Provides: libX11-devel
-#Provides: libXau-devel
-#Provides: libXaw-devel
-#Provides: libXdmcp-devel
-#Provides: libXext-devel
-#Provides: libXfont-devel
-#Provides: libXi-devel
-#Provides: libXmu-devel
-#Provides: libXpm-devel
-#Provides: libXrandr-devel
-#Provides: libXt-devel
-#Provides: libXv-devel
+# don't use package names from xlibs implementation as metapackages
+#Provides: libXcomposite-devel
+#Provides: libXdamage-devel
+#Provides: libXfixes-devel
+#Provides: libXrender-devel
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
Provides: xft = 2.1.6
Provides: xpm
Provides: xrender = 0.8.4
-#Provides: libXrender = 0.8.4
-#Provides: libXft = 2.1.6
-#Provides: libXcursor = 1.1.2
-# Someone should add the versions here, maybe i'll do it later.
-#Provides: libICE
-#Provides: libSM
-#Provides: libX11
-#Provides: libXau
-#Provides: libXaw
-#Provides: libXdmcp
-#Provides: libXext
-#Provides: libXfont
-#Provides: libXi
-#Provides: libXmu
-#Provides: libXpm
-#Provides: libXrandr
-#Provides: libXt
-#Provides: libXv
+#Provides: libXcomposite
+#Provides: libXdamage
+#Provides: libXfixes
+#Provides: libXrender
%ifarch sparc sparc64
Obsoletes: X11R6.1-libs
%endif
%prep
%setup -qc -a1 -a2 -a7
%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%{?with_glide:%patch1 -p0}
+%patch2 -p0
%patch3 -p0
-%patch4 -p1
+%patch4 -p0
%patch5 -p0
%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
%patch10 -p0
-#%patch11 -p0 -- obsoleted???
-%patch12 -p1
-%patch13 -p1
+%patch11 -p0
+%patch13 -p0
%patch14 -p0
-%patch15 -p1
+%patch15 -p0
%patch16 -p0
-#%patch17 -p1 -- not ready, is it required?
-%patch18 -p1
-#%patch19 -p1 -- maybe should be updated to allow using make -j
+%patch17 -p0
+%patch18 -p0
%patch20 -p0
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch26 -p1
-%patch27 -p1
-%ifarch sparc sparc64
-#%patch28 -p1 -- needs update
-%endif
-%patch29 -p0
-%patch30 -p1
+%patch21 -p0
+%patch22 -p0
+%patch23 -p0
+%patch25 -p0
%patch32 -p1
%patch33 -p1
-#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
-#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
-%patch36 -p0
-#%patch38 -p0 -- causing problems IIRC (but not really needed)
-%patch39 -p0
%patch40 -p1
-%{!?debug:%patch41 -p1}
-%{!?with_glide:%patch42 -p0}
-%patch43 -p0
+%patch41 -p1
%patch44 -p0
%patch45 -p1
-%patch46 -p0
-%patch47 -p1
%patch50 -p0
-%patch52 -p1
-%patch53 -p0
-%patch54 -p1
%patch55 -p0
%patch56 -p0
rm -f xc/config/cf/host.def
%build
+PWD=`pwd`
%{__make} -S -C xc World \
FAST=1 \
DEFAULT_OS_CPU_FROB=%{_target_cpu} \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
ICONDIR="%{_iconsdir}" \
- LINUXDIR="/dev/null"
+ LINUXDIR="/dev/null" \
+ TOP="$PWD/xc"
%install
+PWD=`pwd`
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
ICONDIR="%{_iconsdir}" \
- LINUXDIR="/dev/null"
+ LINUXDIR="/dev/null" \
+ TOP="$PWD/xc"
# fix pkgconfig path
if [ "%{_pkgconfigdir}" != "/usr/lib/pkgconfig" ] ; then
%{_mandir}/man1/xon.1*
%{_mandir}/man7/*
+# not related to any packaged files
+#%{_mandir}/man1/XDarwin.1*
+#%{_mandir}/man1/dmxtodmx.1*
+#%{_mandir}/man1/dumpkeymap.1*
+#%{_mandir}/man1/ucs2any.1*
+#%{_mandir}/man1/vdltodmx.1*
+#%{_mandir}/man1/xdmxconfig.1*
+
%lang(it) %{_mandir}/it/man1/startx.1*
%lang(it) %{_mandir}/it/man1/xconsole.1*
%lang(it) %{_mandir}/it/man1/xinit.1*
%dir %{_libx11dir}
%{_libx11dir}/rgb.txt
+%files Xprint
+%defattr(644,root,root,755)
+# XXX: missing dir
+%dir %{_sysconfdir}/X11/xserver/C/print
+%{_sysconfdir}/X11/xserver/C/print/*
+
%files DPS
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/makepsres
%files Xserver
%defattr(644,root,root,755)
-%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/Xorg
+%attr(755,root,root) %{_bindir}/Xdmx
+%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/getconfig*
%attr(755,root,root) %{_sysconfdir}/X11/X
%attr(755,root,root) %{_bindir}/X
+%{_mandir}/man1/Xdmx.1*
%{_mandir}/man1/Xorg.1*
%{_mandir}/man1/Xserver.1*
%{_mandir}/man1/getconfig.1*
%attr(755,root,root) %{_libdir}/libX11.so
%attr(755,root,root) %{_libdir}/libXRes.so
%attr(755,root,root) %{_libdir}/libXTrap.so
+%attr(755,root,root) %{_libdir}/libXau.so
%attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXcomposite.so
%attr(755,root,root) %{_libdir}/libXcursor.so
+%attr(755,root,root) %{_libdir}/libXdamage.so
+%attr(755,root,root) %{_libdir}/libXdmcp.so
+%attr(755,root,root) %{_libdir}/libXevie.so
%attr(755,root,root) %{_libdir}/libXext.so
+%attr(755,root,root) %{_libdir}/libXfixes.so
%attr(755,root,root) %{_libdir}/libXfont.so
-%attr(755,root,root) %{_libdir}/libXfontcache.so
%attr(755,root,root) %{_libdir}/libXft.so
%attr(755,root,root) %{_libdir}/libXi.so
%attr(755,root,root) %{_libdir}/libXinerama.so
%attr(755,root,root) %{_libdir}/libxkbfile.so
%attr(755,root,root) %{_libdir}/libxkbui.so
#%attr(755,root,root) %{_libdir}/libxrx.so
-%{_libdir}/libXau.a
-%{_libdir}/libXdmcp.a
+%{_libdir}/libXprintAppUtil.a
+%{_libdir}/libXprintUtil.a
+%{_libdir}/libdmx.a
%{_libdir}/libfntstubs.a
%{_libdir}/liboldX.a
%{_libdir}/libxf86config.a
%{_includedir}/X11/Xcursor
%{_includedir}/X11/Xft
%{_includedir}/X11/Xmu
+%{_includedir}/X11/XprintAppUtil
+%{_includedir}/X11/XprintUtil
%dir %{_includedir}/X11/extensions
%{_includedir}/X11/extensions/*.h
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libx11dir}/config
%{_mandir}/man1/bdftopcf.1*
-%{_mandir}/man3/[A-FH-Z]*
+%{_mandir}/man3/[A-FH-Zl]*
+%{_pkgconfigdir}/xcomposite.pc
%{_pkgconfigdir}/xcursor.pc
+%{_pkgconfigdir}/xdamage.pc
+%{_pkgconfigdir}/xevie.pc
+%{_pkgconfigdir}/xfixes.pc
%{_pkgconfigdir}/xft.pc
%{_pkgconfigdir}/xrender.pc
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
# i810_dri alone is built on amd64 - what for?
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
-%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
+%attr(755,root,root) %{_libdir}/modules/dri/i915_dri.so
%{_mandir}/man4/i810.4*
%endif
%attr(755,root,root) %{_libdir}/libX11.so.*.*
%attr(755,root,root) %{_libdir}/libXRes.so.*.*
%attr(755,root,root) %{_libdir}/libXTrap.so.*.*
-%attr(755,root,root) %{_libdir}/libXaw.so.*.*
+%attr(755,root,root) %{_libdir}/libXau.so.*.*
+%attr(755,root,root) %{_libdir}/libXaw.so.6.*
+%attr(755,root,root) %{_libdir}/libXaw.so.7.*
+%attr(755,root,root) %{_libdir}/libXaw.so.8.*
+%attr(755,root,root) %{_libdir}/libXcomposite.so.*.*
%attr(755,root,root) %{_libdir}/libXcursor.so.*.*.*
+%attr(755,root,root) %{_libdir}/libXdamage.so.*.*
+%attr(755,root,root) %{_libdir}/libXdmcp.so.*.*
+%attr(755,root,root) %{_libdir}/libXevie.so.*.*
%attr(755,root,root) %{_libdir}/libXext.so.*.*
+%attr(755,root,root) %{_libdir}/libXfixes.so.*.*
%attr(755,root,root) %{_libdir}/libXfont.so.*.*
-%attr(755,root,root) %{_libdir}/libXfontcache.so.*.*
%attr(755,root,root) %{_libdir}/libXft.so.1.*
%attr(755,root,root) %{_libdir}/libXft.so.2.*.*
%attr(755,root,root) %{_libdir}/libXi.so.*.*
%dir %{_libdir}/modules/dri
%dir %{_libdir}/modules/drivers
%attr(755,root,root) %{_libdir}/modules/*.a
-%attr(755,root,root) %{_libdir}/modules/codeconv
%ifnarch amd64
%attr(755,root,root) %{_libdir}/modules/drivers/linux
%endif
%{_libdir}/libX11.a
%{_libdir}/libXRes.a
%{_libdir}/libXTrap.a
+%{_libdir}/libXau.a
%{_libdir}/libXaw.a
+%{_libdir}/libXcomposite.a
%{_libdir}/libXcursor.a
+%{_libdir}/libXdamage.a
+%{_libdir}/libXdmcp.a
+%{_libdir}/libXevie.a
%{_libdir}/libXext.a
+%{_libdir}/libXfixes.a
%{_libdir}/libXfont.a
-%{_libdir}/libXfontcache.a
%{_libdir}/libXft.a
%{_libdir}/libXi.a
%{_libdir}/libXinerama.a
%attr(755,root,root) %{_bindir}/beforelight
%attr(755,root,root) %{_bindir}/ico
%attr(755,root,root) %{_bindir}/listres
+%attr(755,root,root) %{_bindir}/oclock
+%attr(755,root,root) %{_bindir}/rman
%attr(755,root,root) %{_bindir}/showfont
+%attr(755,root,root) %{_bindir}/texteroids
%attr(755,root,root) %{_bindir}/viewres
%attr(755,root,root) %{_bindir}/x11perf
%attr(755,root,root) %{_bindir}/x11perfcomp
%attr(755,root,root) %{_bindir}/xclipboard
%attr(755,root,root) %{_bindir}/xclock
%attr(755,root,root) %{_bindir}/xditview
+%attr(755,root,root) %{_bindir}/xdriinfo
%attr(755,root,root) %{_bindir}/xedit
%attr(755,root,root) %{_bindir}/xev
%attr(755,root,root) %{_bindir}/xeyes
%attr(755,root,root) %{_bindir}/xfd
%attr(755,root,root) %{_bindir}/xfontsel
%attr(755,root,root) %{_bindir}/xgc
+%attr(755,root,root) %{_bindir}/xkill
%attr(755,root,root) %{_bindir}/xload
+%attr(755,root,root) %{_bindir}/xlogo
%attr(755,root,root) %{_bindir}/xmag
%attr(755,root,root) %{_bindir}/xman
%attr(755,root,root) %{_bindir}/xmessage
%attr(755,root,root) %{_bindir}/xmh
-%attr(755,root,root) %{_bindir}/xwininfo
-%attr(755,root,root) %{_bindir}/oclock
-%attr(755,root,root) %{_bindir}/xlogo
-%attr(755,root,root) %{_bindir}/xkill
-%attr(755,root,root) %{_bindir}/rman
+%attr(755,root,root) %{_bindir}/xmore
+%attr(755,root,root) %{_bindir}/xphelloworld
+%attr(755,root,root) %{_bindir}/xplsprinters
+%attr(755,root,root) %{_bindir}/xprehashprinterlist
+%attr(755,root,root) %{_bindir}/xpsimplehelloworld
+%attr(755,root,root) %{_bindir}/xpxthelloworld
%attr(755,root,root) %{_bindir}/xtrap*
-%attr(755,root,root) %{_bindir}/texteroids
+%attr(755,root,root) %{_bindir}/xwininfo
%{_libx11dir}/xedit
%{_libx11dir}/xman.help
%{_mandir}/man1/beforelight.1*
%{_mandir}/man1/ico.1*
%{_mandir}/man1/listres.1*
+%{_mandir}/man1/oclock.1*
+%{_mandir}/man1/rman.1*
%{_mandir}/man1/showfont.1*
+%{_mandir}/man1/texteroids.1*
%{_mandir}/man1/viewres.1*
%{_mandir}/man1/x11perf.1*
%{_mandir}/man1/x11perfcomp.1*
%{_mandir}/man1/xclipboard.1*
%{_mandir}/man1/xclock.1*
%{_mandir}/man1/xditview.1*
+%{_mandir}/man1/xdriinfo.1*
+%{_mandir}/man1/xmore.1*
%{_mandir}/man1/xedit.1*
%{_mandir}/man1/xev.1*
%{_mandir}/man1/xeyes.1*
%{_mandir}/man1/xfd.1*
%{_mandir}/man1/xfontsel.1*
%{_mandir}/man1/xgc.1*
+%{_mandir}/man1/xkill.1*
%{_mandir}/man1/xload.1*
+%{_mandir}/man1/xlogo.1*
%{_mandir}/man1/xmag.1*
%{_mandir}/man1/xman.1*
%{_mandir}/man1/xmessage.1*
%{_mandir}/man1/xmh.1*
+%{_mandir}/man1/xphelloworld.1*
+%{_mandir}/man1/xplsprinters.1*
+%{_mandir}/man1/xprehashprinterlist.1*
+%{_mandir}/man1/xpsimplehelloworld.1*
+%{_mandir}/man1/xpxthelloworld.1*
+%{_mandir}/man1/xtrap*
%{_mandir}/man1/xwininfo.1*
-%{_mandir}/man1/xkill.1*
-%{_mandir}/man1/xlogo.1*
-%{_mandir}/man1/oclock.1*
-%{_mandir}/man1/rman.1*
-%{_mandir}/man1/xtr*
-%{_mandir}/man1/texteroids.1*
%lang(it) %{_mandir}/it/man1/xload.1*
%{_appdefsdir}/Editres-color
%{_appdefsdir}/Viewres
%{_appdefsdir}/XConsole
+%{_appdefsdir}/XFontSel
+%{_appdefsdir}/XMore
+%{_appdefsdir}/Xditview
+%{_appdefsdir}/Xditview-chrtr
%{_appdefsdir}/Xedit
%{_appdefsdir}/Xedit-color
%{_appdefsdir}/Xfd
%{_appdefsdir}/Xmessage
%{_appdefsdir}/Xmessage-color
%{_appdefsdir}/Xmh
-%{_appdefsdir}/XFontSel
-%{_appdefsdir}/Xditview
-%{_appdefsdir}/Xditview-chrtr
%{_desktopdir}/oclock.desktop
%{_desktopdir}/xcalc.desktop