]> git.pld-linux.org Git - packages/X11.git/blobdiff - X11.spec
projects / packages / X11.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- just readd missing part instead of creating another patch
[packages/X11.git] / X11.spec
diff --git a/X11.spec b/X11.spec
index eff7f0f68e82f9b3b507177f99a9abbb921e801a..6c97e58a455ec7a80beda0d28380b163c7db6ef7 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -7,12 +7,10 @@
 # - -Xprint seem to be Xprt configuration files - if they aren't used by
 #   some (possibly remote) X client, merge them into -Xprt
 # - where to take dtpdmd from?
-# - http://security.gentoo.org/glsa/glsa-200509-07.xml
 #
 # Conditional build:
 %bcond_without glide           # don't build glide driver
-
-#http://cambuca.ldhs.cetuc.puc-rio.br/multiuser/
+%bcond_without r300            # r300_dri.so
 %bcond_with    dualhead        # apply dualhead patch
 
 Summary:       XOrg X11 Window System servers and basic programs
@@ -29,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.9.0
-Release:       0.1
+Release:       9
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -77,7 +75,9 @@ Source50:     xcalc.png
 Source51:      xload.png
 Source52:      xmag.png
 Source53:      http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+Source54:      XvMCConfig
 # NoSource53-md5:      0c40bd4545aa630e139043c2b12f0807
+Patch0:                http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-geteuid.diff
 Patch1:                %{name}-PLD.patch
 Patch2:                %{name}-enableglide.patch
 Patch3:                %{name}-DisableDebug.patch
@@ -107,8 +107,12 @@ Patch26:   %{name}-xterm-256colors.patch
 Patch27:       %{name}-makefile-fastbuild.patch
 Patch28:       %{name}-dri-ffb-compile.patch
 Patch29:       %{name}-radeon-entervt.patch
+Patch30:       %{name}-acpi_event_loop_fix.patch
 # updated from http://dl.sourceforge.net/i810fb/i810fb-xfree86-420.tar.bz2 : i810fb-xfree420.diff
 Patch31:       %{name}-i810fb.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=4320
+Patch32:       %{name}-compositefastpath.patch
+Patch33:       ftp://ftp.x.org/pub/X11R6.9.0/patches/x11r6.9.0-mitri.diff
 Patch50:       %{name}-glibc-locale_sync.patch
 Patch60:       %{name}-oldkeyb.patch
 Patch61:       %{name}-sparc64-asmfix.patch
@@ -121,8 +125,9 @@ Patch63:    %{name}-pci-build.patch
 # radeon
 Patch69:       %{name}-radeon-dynamic-clocks.patch
 Patch71:       %{name}-radeon-set-fb-location.patch
-
 Patch72:       http://glen.alkohol.ee/xkb/xorg.patch
+Patch73:       %{name}-r300.patch
+Patch74:       %{name}-unichrome.patch
 
 #head-patch
 #ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
@@ -135,6 +140,7 @@ BuildRequires:      /usr/bin/perl
 %{?with_glide:BuildRequires:   Glide2x_SDK}
 %endif
 BuildRequires: bison
+BuildRequires: cpp
 BuildRequires: ed
 BuildRequires: expat-devel
 BuildRequires: flex
@@ -144,16 +150,16 @@ BuildRequires:    libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: utempter-devel
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-xauth = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.79.0
 Provides:      XFree86 = %{epoch}:%{version}-%{release}
+Obsoletes:     XFree86
 Obsoletes:     xpm-progs
 Obsoletes:     xterm
-Obsoletes:     XFree86
 # for /usr/X11R6/bin/mkfontdir
 Obsoletes:     XFree86-font-utils
 %ifarch sparc sparc64 sparcv9
@@ -391,9 +397,10 @@ Summary(pl):       Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
 Group:         X11/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
-Obsoletes:     XFree86-OpenGL-libGL
 Obsoletes:     X11-driver-firegl
 Obsoletes:     X11-driver-nvidia
+Obsoletes:     XFree86-Mesa-libGL
+Obsoletes:     XFree86-OpenGL-libGL
 Obsoletes:     XFree86-driver-firegl
 Obsoletes:     XFree86-driver-nvidia
 
@@ -446,9 +453,9 @@ Group:              X11/Development/Libraries
 Requires:      %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Requires:      OpenGL-devel-base
-Provides:      OpenGL-devel = 1.5
 Provides:      OpenGL-GLU-devel = 1.3
 Provides:      OpenGL-GLX-devel = 1.4
+Provides:      OpenGL-devel = 1.5
 Provides:      XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     Mesa-devel
 Obsoletes:     XFree86-OpenGL-devel
@@ -466,8 +473,8 @@ Summary:    X11R6 static libraries with OpenGL
 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.5
 Provides:      OpenGL-GLU-static = 1.3
+Provides:      OpenGL-static = 1.5
 Provides:      XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
 Obsoletes:     Mesa-static
 Obsoletes:     XFree86-OpenGL-static
@@ -558,7 +565,6 @@ Requires:   /usr/X11R6/lib/X11/rgb.txt
 Requires:      X11-fonts-base
 Requires:      pam >= 0.79.0
 Provides:      XFree86-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes:     XFree86-Xserver
 Obsoletes:     XFree86-Mono
 Obsoletes:     XFree86-SVGA
 Obsoletes:     XFree86-VGA16
@@ -566,9 +572,13 @@ Obsoletes: XFree86-VGA16
 Obsoletes:     XFree86-Sun
 Obsoletes:     XFree86-Sun24
 # still not supported in 4.2.0:
-#Obsoletes:    XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
+#Obsoletes:    XFree86-8514
+#Obsoletes:    XFree86-AGX
+#Obsoletes:    XFree86-Mach8
+#Obsoletes:    XFree86-P9000
 # (and many drivers from XF86_SVGA server... and some from others)
 Obsoletes:     XFree86-XF86Setup
+Obsoletes:     XFree86-Xserver
 Obsoletes:     Xconfigurator
 
 %description Xserver
@@ -671,6 +681,7 @@ Requires:   %{name}-imake = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      fontconfig-devel >= 1:2.2.0
 Provides:      XFree86-devel = %{epoch}:%{version}-%{release}
+Provides:      libXvMCW-devel
 Provides:      render = 0.8
 Provides:      xcursor-devel = 1.1.2
 Provides:      xft-devel = 2.1.6
@@ -691,6 +702,7 @@ Obsoletes:  XFree86-xft-devel
 Obsoletes:     XFree86-xft2-devel
 Obsoletes:     XFree86-xrender-devel
 Obsoletes:     Xft-devel
+Obsoletes:     libXvMCW-devel
 Obsoletes:     render
 Obsoletes:     xcursor-devel
 Obsoletes:     xft-devel
@@ -787,8 +799,8 @@ Summary:    ATI video driver
 Summary(pl):   Sterownik do kart ATI
 Group:         X11/Servers
 Requires:      %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
 Requires:      %{name}-driver-i2c = %{epoch}:%{version}-%{release}
+Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:     XFree86-ATI
 Obsoletes:     XFree86-Mach32
 Obsoletes:     XFree86-Mach64
@@ -1443,17 +1455,19 @@ Summary(ru):    
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
 Group:         X11/Libraries
 Requires(post,postun): /sbin/ldconfig
+Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      glibc >= 6:2.3.5-7.6
 Provides:      XFree86-libs = %{epoch}:%{version}-%{release}
-Provides:      xcursor = 1.1.2
-Provides:      xft = 2.1.6
-Provides:      xpm
-Provides:      xrender = 0.8.4
 #Provides:     libXcomposite
 #Provides:     libXdamage
 #Provides:     libXfixes
 #Provides:     libXrender
+Provides:      libXvMCW
+Provides:      xcursor = 1.1.2
+Provides:      xft = 2.1.6
+Provides:      xpm
+Provides:      xrender = 0.8.4
 %ifarch sparc sparc64 sparcv9
 Obsoletes:     X11R6.1-libs
 %endif
@@ -1463,8 +1477,10 @@ Obsoletes:       XFree86-xft
 Obsoletes:     XFree86-xft2
 Obsoletes:     XFree86-xrender
 Obsoletes:     Xft
+Obsoletes:     libXvMCW
 Obsoletes:     xcursor
 Obsoletes:     xft
+Obsoletes:     xorg-x11-libs-data
 Obsoletes:     xpm
 Obsoletes:     xrender
 
@@ -1907,6 +1923,7 @@ Provides: xfs = %{epoch}:%{version}-%{release}
 Obsoletes:     XFree86-xfs
 Obsoletes:     xfs
 Obsoletes:     xfsft
+Obsoletes:     xorg-x11-xfs
 
 %description xfs
 This is a font server for XOrg X11. You can serve fonts to other X
@@ -1942,6 +1959,10 @@ X11-libs.
 
 %prep
 %setup -qc -a1 -a2 -a7
+cd xc
+%patch0 -p0
+%patch33 -p0
+cd ..
 %patch1 -p1
 %{?with_glide:%patch2 -p0}
 %patch3 -p0
@@ -1974,9 +1995,10 @@ X11-libs.
 rm -f xc/config/cf/host.def
 
 %patch29 -p1
+%patch30 -p0
 %patch31 -p0
-# ankry, FIXME :)
-# %patch50 -p1
+%patch32 -p0
+%patch50 -p1
 %patch60 -p0
 # FIXME
 # %patch61 -p1
@@ -1989,9 +2011,11 @@ rm -f xc/config/cf/host.def
 # %patch71 -p0
 %{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
 
+%{?with_r300:%patch73 -p1}
+%{?with_r300:%patch74 -p1}
+# patch74 required patch73
 %{?with_dualhead:%patch100 -p1}
 
-
 sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
        xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
 
@@ -2028,7 +2052,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
 PWD=`pwd`
 %{__make} -C xc        install install.man \
        DESTDIR="$RPM_BUILD_ROOT" \
-       DOCDIR="/usr/share/doc/%{name}-%{version}" \
+       DOCDIR="%{_docdir}/%{name}-%{version}" \
        INSTBINFLAGS="-m 755" \
        INSTPGMFLAGS="-m 755" \
        RAWCPP="/lib/cpp" \
@@ -2128,14 +2152,14 @@ ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libx11dir}/fonts
 rm -f $RPM_BUILD_ROOT%{_libx11dir}/xkb/xkbcomp
 ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp
 
-ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
+ln -sf %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
 
 rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
 
 :> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
 :> $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf
 
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
 
 # resolve conflict with man-pages
 mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
@@ -2143,16 +2167,18 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
 # help rpm to detect deps
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/modules/dri/*.so
 
-gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*
 
 # don't gzip README.* files, they are needed by XF86Setup
-gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
+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/X11-%{_lib}.conf
 
 chmod -R u+w $RPM_BUILD_ROOT
 
+cp -a %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2187,18 +2213,16 @@ sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
 %post xdm
 /sbin/chkconfig --add xdm
 if [ -f /var/lock/subsys/xdm ]; then
-       echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+       echo "Run \"/sbin/service xdm restart\" to restart xdm." >&2
        echo "WARNING: it will terminate all sessions opened from xdm!" >&2
 else
-       echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
+       echo "Run \"/sbin/service xdm start\" to start xdm." >&2
 fi
 
 %preun xdm
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/xdm ]; then
-               /etc/rc.d/init.d/xdm stop >&2
-       fi
        /sbin/chkconfig --del xdm
+       %service xdm stop
 fi
 
 %pre xfs
@@ -2207,17 +2231,11 @@ fi
 
 %post xfs
 /sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
-       /etc/rc.d/init.d/xfs restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
 
 %preun xfs
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/xfs ]; then
-               /etc/rc.d/init.d/xfs stop >&2
-       fi
+       %service xfs stop
        /sbin/chkconfig --del xfs
 fi
 
@@ -2234,7 +2252,7 @@ fi
 %groupadd -P %{name}-xfs -g 56 -r -f xfs
 %useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
 /sbin/chkconfig --add xfs
-/etc/rc.d/init.d/xfs start >&2
+/sbin/service xfs start >&2
 
 %triggerpostun Xserver -- XFree86-Xserver
 if [ -s /etc/X11/XF86Config.rpmsave ]; then
@@ -2601,6 +2619,7 @@ fi
 %{_libx11dir}/getconfig
 
 %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XvMCConfig
 %attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
 %config(missingok) /etc/security/console.apps/xserver
@@ -2861,6 +2880,9 @@ fi
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
+%if %{with r300}
+%attr(755,root,root) %{_libdir}/modules/dri/r300_dri.so
+%endif
 %endif
 %{_mandir}/man4/radeon.4*
 
@@ -3006,6 +3028,9 @@ fi
 %files driver-via
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/via_drv.so
+%ifarch %{ix86}
+%attr(755,root,root) %{_libdir}/modules/dri/unichrome_dri.so
+%endif
 %{_mandir}/man4/via.4*
 %endif
 
This page took 0.03898 seconds and 4 git commands to generate.