- s,/lib/security,,

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index 7a182f2b6d4368b30293496a6f45be61e0c9426f..aef6fca6a9c1e6944b22230e23dfb096787ee980 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -25,13 +25,13 @@ Summary(ru):        
 Summary(uk):   âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
-Version:       4.3.99.16
-Release:       0.1
+Version:       4.3.99.901
+Release:       0.2
 Epoch:         1
 License:       MIT
 Group:         X11/XFree86
 Source0:       ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 9060c02f9e07620b8595e4d3da77a4b3
+# Source0-md5: 110b2eb9ca59fc2794e6ab46ec5c86a8
 #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
@@ -132,6 +132,13 @@ Patch50:   %{name}-xterm-256colors.patch
 Patch51:       %{name}-new-s3-pScreen.patch
 URL:           http://www.xfree86.org/
 BuildRequires: %{_bindir}/perl
+%ifarch %{ix86} alpha
+%{!?_without_tdfx:BuildRequires:       Glide3-DRI-devel}
+%endif
+# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
+%ifarch %{ix86}
+%{!?_without_tdfx:BuildRequires:       Glide2x_SDK}
+%endif
 BuildRequires: bison
 BuildRequires: ed
 BuildRequires: expat-devel
@@ -141,17 +148,11 @@ BuildRequires:    libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.122
 BuildRequires: tcl-devel
+BuildRequires: unzip
 BuildRequires: utempter-devel
 BuildRequires: zlib-devel
-BuildRequires: unzip
-%ifarch %{ix86} alpha
-%{!?_without_tdfx:BuildRequires:       Glide3-DRI-devel}
-%endif
-# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86}
-%{!?_without_tdfx:BuildRequires:       Glide2x_SDK}
-%endif
 Requires:      %{name}-libs = %{epoch}:%{version}
 Requires:      xauth
 Requires:      pam >= 0.77.3
@@ -166,8 +167,6 @@ Obsoletes:  X11R6.1
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
-%define                _icondir        /usr/share/icons
-%define                _pixmapsdir     /usr/share/pixmaps
 %define                _soundsdir      /usr/share/sounds
 %define                _themesdir      /usr/share/themes
 %define                _wmpropsdir     /usr/share/wm-properties
@@ -1573,6 +1572,48 @@ Xconfigurator, XFree86-xfs 
 
 ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib.
 
+%package -n XcursorTheme-handhelds
+Summary:       Cursors Theme "handhelds"
+Summary(pl):   Motyw kursorów "handhelds"
+Group:         X11/Themes
+Requires:      XFree86-libs
+Requires:      xcursor
+Conflicts:     XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-handhelds
+Cursors theme "handhelds" for X11.
+
+%description -n XcursorTheme-handhelds -l pl
+Motyw kursorów "handhelds" dla X11.
+
+%package -n XcursorTheme-redglass
+Summary:       Cursors theme "redglass"
+Summary(pl):   Motyw kursorów "redglass"
+Group:         X11/Themes
+Requires:      XFree86-libs
+Requires:      xcursor
+Conflicts:     XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-redglass
+Cursors theme "redglass" for X11.
+
+%description -n XcursorTheme-redglass -l pl
+Motyw kursorów "redglass" dla X11.
+
+%package -n XcursorTheme-whiteglass
+Summary:       Cursors theme "whiteglass"
+Summary(pl):   Motyw kursorów "whiteglass"
+Group:         X11/Themes
+Requires:      XFree86-libs
+Requires:      xcursor
+Conflicts:     XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-whiteglass
+Cursors theme "whiteglass" for X11.
+
+%description -n XcursorTheme-whiteglass -l pl
+Motyw kursorów "whiteglass" dla X11.
+
 %package -n imake
 Summary:       C preprocessor interface to the make utility
 Summary(pl):   Miedzymordzie do make oparte o preprocesor C
@@ -1826,7 +1867,7 @@ rm -rf xc/fonts
        CXXOPTIONS="%{rpmcflags}" \
        CXXDEBUGFLAGS="" \
        CDEBUGFLAGS="" \
-       ICONDIR="%{_icondir}" \
+       ICONDIR="%{_iconsdir}" \
        LINUXDIR="%{_kernelsrcdir}"
 
 %ifnarch alpha
@@ -1852,7 +1893,7 @@ xmkmf $olddir/xc .
        CXXOPTIONS="%{rpmcflags}" \
        CXXDEBUGFLAGS="" \
        CDEBUGFLAGS="" \
-       ICONDIR="%{_icondir}" \
+       ICONDIR="%{_iconsdir}" \
        LINUXDIR="%{_kernelsrcdir}"
 cd $olddir
 %endif
@@ -1867,7 +1908,7 @@ TOPDIR=$(pwd)/xc
        CXXOPTIONS="%{rpmcflags}" \
        CXXDEBUGFLAGS="" \
        CDEBUGFLAGS="" \
-       ICONDIR="%{_icondir}" \
+       ICONDIR="%{_iconsdir}" \
        LINUXDIR="%{_kernelsrcdir}"
 
 cd synaptics
@@ -1887,7 +1928,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
        $RPM_BUILD_ROOT%{_sbindir} \
        $RPM_BUILD_ROOT/usr/{bin,include,lib} \
        $RPM_BUILD_ROOT/var/{log,lib/xkb} \
-       $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}/mini} \
+       $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/mini,%{_pixmapsdir}/mini} \
        $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
        $RPM_BUILD_ROOT%{_xsessdir}
 
@@ -1902,7 +1943,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
        CXXOPTIONS="%{rpmcflags}" \
        CXXDEBUGFLAGS="" \
        CDEBUGFLAGS="" \
-       ICONDIR="%{_icondir}" \
+       ICONDIR="%{_iconsdir}" \
        LINUXDIR="%{_kernelsrcdir}"
 
 %ifnarch sparc sparc64
@@ -2153,8 +2194,6 @@ fi
 %{_appdefsdir}/XTerm
 %lang(pl) %{_appdefsdir}/pl/XTerm
 %{_appdefsdir}/XTerm-color
-%dir %{_icondir}
-%{_icondir}/*
 
 %attr(755,root,root) %{_libdir}/X11/lbxproxy
 %attr(755,root,root) %{_libdir}/X11/proxymngr
@@ -2897,6 +2936,8 @@ fi
 %dir %{_sbindir}
 %dir %{_datadir}/locale
 %dir %{_datadir}/misc
+%dir %{_iconsdir}
+%dir %{_iconsdir}/mini
 %dir %{_pixmapsdir}
 %dir %{_pixmapsdir}/mini
 %dir %{_soundsdir}
@@ -3149,6 +3190,18 @@ fi
 %{_pixmapsdir}/xload.png
 %{_pixmapsdir}/xmag.png
 
+%files -n XcursorTheme-handhelds
+%defattr(644,root,root,755)
+%{_iconsdir}/handhelds
+
+%files -n XcursorTheme-redglass
+%defattr(644,root,root,755)
+%{_iconsdir}/redglass
+
+%files -n XcursorTheme-whiteglass
+%defattr(644,root,root,755)
+%{_iconsdir}/whiteglass
+
 %files -n imake
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ccmakedep
@@ -3198,9 +3251,6 @@ fi
 %attr(755,root,root) %{_libdir}/X11/xdm
 %attr(755,root,root) %{_bindir}/xdm
 %attr(755,root,root) %{_bindir}/chooser
-%ifarch alpha
-%attr(755,root,root) %{_libdir}/libXdmGreet.so*
-%endif
 %{_mandir}/man1/xdm.1*
 
 %dir /etc/X11/xdm