- typos, added Conflicts

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index 8c9e6f4e09b5389f6ab837e87d94cb5115576eba..74e14b28bd4d643017abd1c888bad1e42b81866a 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -11,7 +11,7 @@
 %define                _synaptics_ver  0.11.3p11
 
 Summary:       XFree86 Window System servers and basic programs
-Summary(de):   Xfree86 Window-System-Server und grundlegende Programme
+Summary(de):   XFree86 Window-System-Server und grundlegende Programme
 Summary(es):   Programas básicos y servidores para el sistema de ventanas XFree86
 Summary(fr):   Serveurs du système XFree86 et programmes de base
 Summary(ja):   XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
@@ -23,12 +23,12 @@ Summary(ru):        
 Summary(uk):   âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
-Version:       4.3.99.11
-Release:       0.3
+Version:       4.3.99.12
+Release:       0.1
 License:       MIT
 Group:         X11/XFree86
 Source0:       ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 0aa6cbc6ee19d38f3ab916929f283ac7
+# Source0-md5: 12820de14d53c61cc84a0f20109f1743
 #Source1:      ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz
 #Source2:      ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz
 Source3:       ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
@@ -116,7 +116,6 @@ Patch45:    %{name}-spencode-nowarning.patch
 Patch46:       %{name}-lock.patch
 Patch47:       %{name}-linux-version.patch
 Patch48:       %{name}-new-s3-nodebug.patch
-Patch49:       %{name}-core_pointer.patch
 URL:           http://www.xfree86.org/
 BuildRequires: %{_bindir}/perl
 BuildRequires: bison
@@ -334,6 +333,7 @@ Summary:    OpenGL support for X11R6
 Summary(pl):   Wsparcie OpenGL dla systemu X11R6
 Group:         X11/Libraries
 Requires:      %{name}-libs = %{version}
+Requires:      XFree86-OpenGL-libGL
 Obsoletes:     XFree86-driver-nvidia
 
 %description OpenGL-core
@@ -342,13 +342,27 @@ OpenGL support for X11R6 system.
 %description OpenGL-core -l pl
 Wsparcie OpenGL dla systemu X11R6.
 
+%package OpenGL-libGL
+Summary:       OpenGL support for X11R6 - GL library
+Summary(pl):   Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
+Group:         X11/Libraries
+Requires:      XFree86-OpenGL-core = %{version}
+Obsoletes:     XFree86-driver-firegl
+Conflicts:     OpenGL-core < 4.3.99.12
+
+%description OpenGL-libGL
+OpenGL support for X11R6 system - GL library.
+
+%description OpenGL-libGL -l pl
+Wsparcie OpenGL dla systemu X11R6 - biblioteka GL.
+
 %package OpenGL-devel
 Summary:       OpenGL for X11R6 development
 Summary(pl):   Pliki nag³ówkowe OpenGL dla systemu X11R6
 Group:         X11/Development/Libraries
+Requires:      OpenGL-devel-base
 Requires:      %{name}-OpenGL-libs = %{version}
 Requires:      %{name}-devel
-Requires:      OpenGL-devel-base
 Provides:      OpenGL-devel
 Obsoletes:     Mesa-devel
 Obsoletes:     XFree86-OpenGL-doc
@@ -364,9 +378,9 @@ Pliki nag
 Summary:       OpenGL for X11R6 development (only gl?.h)
 Summary(pl):   Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
 Group:         X11/Development/Libraries
+Requires:      OpenGL-devel
 Requires:      %{name}-OpenGL-libs = %{version}
 Requires:      %{name}-devel
-Requires:      OpenGL-devel
 Provides:      OpenGL-devel-base
 
 %description OpenGL-devel-base
@@ -413,7 +427,7 @@ Summary(uk):        "
 Group:         X11/XFree86/Servers
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      XFree86-fonts-base
+Requires:      %{name}-fonts-base
 
 %description Xnest
 Xnest is an X Window System server which runs in an X window. Xnest is
@@ -455,7 +469,7 @@ Group:              X11/XFree86/Servers
 PreReq:                xprint-initrc
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      XFree86-fonts-base
+Requires:      %{name}-fonts-base
 
 %description Xprt
 Xprt provides an X server with the print extension and special DDX
@@ -473,15 +487,19 @@ Summary(tr):      XFree86 sunucusu
 Group:         X11/XFree86/Servers
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      XFree86-fonts-base
+Requires:      %{name}-fonts-base
 Requires:      pam
-Obsoletes:     XFree86-VGA16 XFree86-SVGA XFree86-Mono
+Obsoletes:     XFree86-Mono
+Obsoletes:     XFree86-SVGA
+Obsoletes:     XFree86-VGA16
 # obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
-Obsoletes:     XFree86-Sun XFree86-Sun24
+Obsoletes:     XFree86-Sun
+Obsoletes:     XFree86-Sun24
 # still not supported in 4.2.0:
 #Obsoletes:    XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
 # (and many drivers from XF86_SVGA server... and some from others)
-Obsoletes:     XFree86-XF86Setup Xconfigurator
+Obsoletes:     XFree86-XF86Setup
+Obsoletes:     Xconfigurator
 
 %description Xserver
 Generally used X server which uses display hardware. It requires
@@ -530,7 +548,7 @@ Summary(uk):        
 Group:         X11/XFree86/Servers
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      XFree86-fonts-base
+Requires:      %{name}-fonts-base
 
 %description Xvfb
 Xvfb (X Virtual Frame Buffer) is an X Window System server that is
@@ -707,7 +725,9 @@ Summary(pl):        Sterownik do kart ATI
 Group:         X11/XFree86
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Obsoletes:     XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Obsoletes:     XFree86-ATI
+Obsoletes:     XFree86-Mach32
+Obsoletes:     XFree86-Mach64
 
 %description driver-ati
 ATI video driver.
@@ -719,9 +739,9 @@ Sterownik do kart ATI.
 Summary:       ATI Rage 128 video driver
 Summary(pl):   Sterownik do kart ATI Rage 128
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
 Conflicts:     XFree86-driver-nvidia
 Obsoletes:     XFree86-Rage128
 
@@ -735,10 +755,10 @@ Sterownik do kart ATI Rage 128.
 Summary:       ATI Radeon video driver
 Summary(pl):   Sterownik do kart ATI Radeon
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
-Requires:      XFree86-driver-ati
+Requires:      %{name}-driver-ati
 Conflicts:     XFree86-driver-nvidia
 
 %description driver-radeon
@@ -753,7 +773,9 @@ Summary(pl):        Sterownik do kart ATI (ATI.2)
 Group:         X11/XFree86
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Obsoletes:     XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Obsoletes:     XFree86-ATI
+Obsoletes:     XFree86-Mach32
+Obsoletes:     XFree86-Mach64
 
 %description driver-ati.2
 ATI video driver (ATI.2) from gatos (http://gatos.sourceforge.net/).
@@ -766,10 +788,10 @@ Sterownik do kart ATI (ATI.2) projektu gatos
 Summary:       ATI Rage 128 video driver (ATI.2)
 Summary(pl):   Sterownik do kart ATI Rage 128 (ATI.2)
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
-Requires:      XFree86-driver-ati.2
+Requires:      %{name}-driver-ati.2
 Conflicts:     XFree86-driver-nvidia
 Obsoletes:     XFree86-Rage128
 
@@ -785,10 +807,10 @@ Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos
 Summary:       ATI Radeon video driver (ATI.2)
 Summary(pl):   Sterownik do kart ATI Radeon (ATI.2)
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
-Requires:      XFree86-driver-ati.2
+Requires:      %{name}-driver-ati.2
 Conflicts:     XFree86-driver-nvidia
 
 %description driver-radeon.2
@@ -885,9 +907,9 @@ Sterownik do kart Voodoo1 i Voodoo2 firmy 3Dfx.
 Summary:       GLINT/Permedia video driver
 Summary(pl):   Sterownik do kart GLINT i Permedia
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
 Conflicts:     XFree86-driver-nvidia
 Obsoletes:     XFree86-3DLabs
 
@@ -929,9 +951,9 @@ Sterownik do kart na uk
 Summary:       Intel i810/i815/i830 video driver
 Summary(pl):   Sterownik do grafiki na uk³adach Intel i810/i815/i830
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
 Conflicts:     XFree86-driver-nvidia
 Obsoletes:     XFree86-i810
 
@@ -958,9 +980,9 @@ Sterownik do kart Integrated Micro Solutions Twin Turbo 128.
 Summary:       Matrox video driver
 Summary(pl):   Sterownik do kart Matrox
 Group:         X11/XFree86
+Requires:      OpenGL
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      %{name}-modules = %{version}-%{release}
-Requires:      OpenGL
 Conflicts:     XFree86-driver-nvidia
 Obsoletes:     XFree86-mga
 
@@ -1207,10 +1229,10 @@ Sterownik do kart Sun TCX.
 Summary:       3Dfx video driver
 Summary(pl):   Sterownik do kart 3Dfx
 Group:         X11/XFree86
-Requires:      %{name}-Xserver = %{version}-%{release}
-Requires:      %{name}-modules = %{version}-%{release}
 Requires:      Glide3-DRI
 Requires:      OpenGL
+Requires:      %{name}-Xserver = %{version}-%{release}
+Requires:      %{name}-modules = %{version}-%{release}
 Conflicts:     XFree86-driver-nvidia
 Obsoletes:     XFree86-3dfx
 
@@ -1470,7 +1492,7 @@ Summary(ru):      
 Summary(uk):   ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
 Group:         X11/XFree86
 Requires:      %{name} >= %{version}
-Requires:      XFree86-libs = %{version}
+Requires:      %{name}-libs = %{version}
 Requires:      man-config
 Obsoletes:     X11R6-contrib
 
@@ -1580,7 +1602,7 @@ Summary(pl):      Twm - podstawowy zarz
 Summary(ru):   ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
 Summary(uk):   ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
 Group:         X11/Window Managers
-Requires:      XFree86-libs = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description -n twm
 Twm is a window manager for the X Window System. It provides
@@ -1670,8 +1692,8 @@ Requires(pre):    /usr/sbin/groupadd
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
+Requires:      %{name}-fonts-base
 Requires:      %{name}-libs = %{version}
-Requires:      XFree86-fonts-base
 Obsoletes:     xfsft XFree86-xfs
 
 %description -n xfs
@@ -1761,7 +1783,6 @@ System. 
 %patch47 -p1
 tar xfz *.tar.gz
 %patch48 -p0
-%patch49 -p0
 
 rm -f xc/config/cf/host.def
 
@@ -1838,14 +1859,14 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
        $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
        $RPM_BUILD_ROOT%{_datadir}/misc \
        $RPM_BUILD_ROOT%{_sbindir} \
        $RPM_BUILD_ROOT/usr/{bin,include,lib} \
        $RPM_BUILD_ROOT/var/{log,lib/xkb} \
-       $RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
-       $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
+       $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}/mini} \
+       $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
 
 %{__make} -C xc        install install.man \
        DESTDIR="$RPM_BUILD_ROOT" \
@@ -1919,14 +1940,11 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
 install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
 
 install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
-install %{SOURCE21} $RPM_BUILD_ROOT%{_applnkdir}/Amusements
-install %{SOURCE22} $RPM_BUILD_ROOT%{_applnkdir}/Editors
-install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
-install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \
-               $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE30} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
-       %{SOURCE36} %{SOURCE37} \
+install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \
+       %{SOURCE26} %{SOURCE27} \
+       $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
+       %{SOURCE35} %{SOURCE36} %{SOURCE37} \
        $RPM_BUILD_ROOT%{_pixmapsdir}
 
 bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -1988,6 +2006,9 @@ rm -rf $RPM_BUILD_ROOT
 %post   OpenGL-core -p /sbin/ldconfig
 %postun OpenGL-core -p /sbin/ldconfig
 
+%post   OpenGL-libGL -p /sbin/ldconfig
+%postun OpenGL-libGL -p /sbin/ldconfig
+
 %post   OpenGL-libs -p /sbin/ldconfig
 %postun OpenGL-libs -p /sbin/ldconfig
 
@@ -2206,10 +2227,13 @@ fi
 %{_includedir}/X11/bitmaps
 %{_includedir}/X11/pixmaps
 
-%{_applnkdir}/Utilities/xconsole.desktop
-%{_applnkdir}/Terminals/*
+%{_desktopdir}/xconsole.desktop
+%{_desktopdir}/xterm.desktop
+%{_pixmapsdir}/xconsole.png
+%{_pixmapsdir}/xlogo64.png
+%{_pixmapsdir}/xterm.png
+
 %{_libdir}/X11/app-defaults/Xvidtune
-%{_pixmapsdir}/x*
 
 %{_mandir}/man1/Xmark.1*
 %{_mandir}/man1/appres.1*
@@ -2334,13 +2358,16 @@ fi
 %files OpenGL-core
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/glxgears
-%attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) /usr/lib/libGL.so*
 %attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
 %attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
 %{_mandir}/man1/glxgears.1x*
 
+%files OpenGL-libGL
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libGL.so.*.*
+%attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) /usr/lib/libGL.so*
+
 %files OpenGL-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libGLU.so
@@ -2597,6 +2624,7 @@ fi
 %files driver-nv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
 %{_mandir}/man4/nv*
 %endif
 
@@ -3025,12 +3053,16 @@ fi
 %{_libdir}/X11/app-defaults/Xditview
 %{_libdir}/X11/app-defaults/Xditview-chrtr
 
-%{_applnkdir}/Utilities/xclipboard.desktop
-%{_applnkdir}/Utilities/oclock.desktop
-%{_applnkdir}/Utilities/xclock.desktop
-%{_applnkdir}/Editors/xedit.desktop
-%{_applnkdir}/Amusements/xeyes.desktop
-%{_pixmapsdir}/oclock*
+%{_desktopdir}/oclock.desktop
+%{_desktopdir}/xclipboard.desktop
+%{_desktopdir}/xclock.desktop
+%{_desktopdir}/xedit.desktop
+%{_desktopdir}/xeyes.desktop
+%{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xclipboard.png
+%{_pixmapsdir}/xclock.png
+%{_pixmapsdir}/xedit.png
+%{_pixmapsdir}/xeyes.png
 
 %files -n imake
 %defattr(644,root,root,755)