- create xsession directory

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index aaa23828a85ccf14eddec2cab5a86e8ddefa97bc..5a5a0776d223403b0da98f1a03cb5ebfee702227 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -23,12 +23,12 @@ Summary(ru):        
 Summary(uk):   âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
-Version:       4.3.99.12
-Release:       0.1
+Version:       4.3.99.13
+Release:       0.2
 License:       MIT
 Group:         X11/XFree86
 Source0:       ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 12820de14d53c61cc84a0f20109f1743
+# Source0-md5: 908b6c8b7ba2d52e54565c2f728fdfff
 #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
@@ -66,6 +66,12 @@ Source40:    http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver
 Source41:      http://www.linux.org.uk/~alan/S3.zip
 # Source41-md5:        8b754fc6bbded60b683563b945e384b0
 Source42:      twm-xsession.desktop
+Source43:      xcalc.desktop
+Source44:      xload.desktop
+Source45:      xmag.desktop
+Source46:      xcalc.png
+Source47:      xload.png
+Source48:      xmag.png
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-HasZlib.patch
 Patch2:                %{name}-DisableDebug.patch
@@ -91,7 +97,7 @@ Patch21:      %{name}-r128-busmstr2.patch
 Patch22:       %{name}-neomagic_swcursor.patch
 Patch23:       %{name}-mga-busmstr.patch
 Patch24:       %{name}-agpgart-load.patch
-Patch25:       %{name}-symbols.patch
+
 Patch26:       %{name}-HasFreetype2.patch
 Patch27:       %{name}-config-s3.patch
 Patch28:       %{name}-sparc_pci_domains.patch
@@ -117,6 +123,7 @@ Patch45:    %{name}-spencode-nowarning.patch
 Patch46:       %{name}-lock.patch
 Patch47:       %{name}-linux-version.patch
 Patch48:       %{name}-new-s3-nodebug.patch
+Patch49:       %{name}-genauth.patch
 URL:           http://www.xfree86.org/
 BuildRequires: %{_bindir}/perl
 BuildRequires: bison
@@ -140,6 +147,7 @@ BuildRequires:      zlib-devel
 %endif
 Requires:      %{name}-libs = %{version}
 Requires:      xauth
+Requires:      pam >= 0.77.3
 ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xpm-progs
@@ -156,6 +164,7 @@ Obsoletes:  X11R6.1
 %define                _soundsdir      /usr/share/sounds
 %define                _themesdir      /usr/share/themes
 %define                _wmpropsdir     /usr/share/wm-properties
+%define                _xsessdir       /usr/share/xsessions
 
 # avoid Mesa dependency in XFree86-OpenGL-libs
 # Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
@@ -1759,7 +1768,7 @@ System. 
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p0
+
 %patch26 -p1
 %patch27 -p1
 %ifarch sparc sparc64
@@ -1784,6 +1793,7 @@ System. 
 %patch47 -p1
 tar xfz *.tar.gz
 %patch48 -p0
+%patch49 -p0
 
 rm -f xc/config/cf/host.def
 
@@ -1860,14 +1870,15 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{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,xdg} \
        $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,xsessions} \
        $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{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
+       $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
+       $RPM_BUILD_ROOT%{_xsessdir}
 
 %{__make} -C xc        install install.man \
        DESTDIR="$RPM_BUILD_ROOT" \
@@ -1942,16 +1953,17 @@ install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
 
 install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
 install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \
-       %{SOURCE26} %{SOURCE27} \
+       %{SOURCE26} %{SOURCE27} %{SOURCE43} %{SOURCE44} %{SOURCE45} \
        $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
-       %{SOURCE35} %{SOURCE36} %{SOURCE37} \
+       %{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE46} %{SOURCE47} \
+       %{SOURCE48} \
        $RPM_BUILD_ROOT%{_pixmapsdir}
 
 bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 # twm desktop file for gdm/kdm support
-install %{SOURCE42} $RPM_BUILD_ROOT%{_datadir}/xsessions/twm.desktop
+install %{SOURCE42} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop
 
 :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
@@ -2834,6 +2846,7 @@ fi
 
 %files libs -f XFree86-libs.lang
 %defattr(644,root,root,755)
+%dir %{_sysconfdir}/xdg
 %dir %{_themesdir}
 %dir %{_themesdir}/Default
 %dir %{_themesdir}/ThinIce
@@ -3059,15 +3072,21 @@ fi
 %{_libdir}/X11/app-defaults/Xditview-chrtr
 
 %{_desktopdir}/oclock.desktop
+%{_desktopdir}/xcalc.desktop
 %{_desktopdir}/xclipboard.desktop
 %{_desktopdir}/xclock.desktop
 %{_desktopdir}/xedit.desktop
 %{_desktopdir}/xeyes.desktop
+%{_desktopdir}/xload.desktop
+%{_desktopdir}/xmag.desktop
 %{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xcalc.png
 %{_pixmapsdir}/xclipboard.png
 %{_pixmapsdir}/xclock.png
 %{_pixmapsdir}/xedit.png
 %{_pixmapsdir}/xeyes.png
+%{_pixmapsdir}/xload.png
+%{_pixmapsdir}/xmag.png
 
 %files -n imake
 %defattr(644,root,root,755)
@@ -3093,7 +3112,7 @@ fi
 %files -n twm
 %defattr(644,root,root,755)
 %{_wmpropsdir}/twm.desktop
-%{_datadir}/xsessions/twm.desktop
+%{_xsessdir}/twm.desktop
 %attr(755,root,root) %{_bindir}/twm
 %dir %{_sysconfdir}/X11/twm
 %config %{_sysconfdir}/X11/twm/system.twmrc