X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86.spec;h=8638771429f9d7284da64367e161d727db07d9f5;hb=3c2fafe23f54f388f74e6e462e2dc10ce2ea9d53;hp=e239cc1c816422ff6c1646c93725e061ca80671b;hpb=cf1a98f445b17ea31c5fd5290e2e733d1ce54379;p=packages%2FXFree86.git diff --git a/XFree86.spec b/XFree86.spec index e239cc1..8638771 100644 --- a/XFree86.spec +++ b/XFree86.spec @@ -68,7 +68,7 @@ Source50: xcalc.png Source51: xload.png Source52: xmag.png Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h -# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf +# NoSource53-md5: b3e8590b46dbab4341841592147fba26 Source54: XFree86-xrender.pc Patch0: %{name}-PLD.patch Patch1: %{name}-HasZlib.patch @@ -141,7 +141,7 @@ BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: ncurses-devel BuildRequires: pam-devel -BuildRequires: rpmbuild(macros) >= 1.159 +BuildRequires: rpmbuild(macros) >= 1.202 BuildRequires: tcl-devel BuildRequires: utempter-devel BuildRequires: zlib-devel @@ -163,6 +163,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _wallpapersdir /usr/share/wallpapers %define _wmpropsdir /usr/share/wm-properties %define _xsessdir /usr/share/xsessions +%define _wmstylesdir /etc/sysconfig/wmstyles %define _libx11dir %{_prefix}/lib/X11 %define _appdefsdir %{_libx11dir}/app-defaults @@ -216,7 +217,7 @@ puestos a disposici X Window System jest graficznym interfejsem u¿ytkownika; cechuje siê mo¿liwo¶ci± pracy w wielu oknach, z wieloma klientami i do tego w ró¿nych wystrojach okien. :) Jest u¿ywany na wiêkszo¶ci platform -sytemów Unix, a klienci mog± byæ uruchamiani tak¿e pod innymi +systemów Unix, a klienci mog± byæ uruchamiani tak¿e pod innymi popularnymi systemami okienkowymi. Protokó³ X pozwala na uruchamianie aplikacji zarówno z lokalnej maszyny jak i poprzez sieæ - daj±c przez to elastyczn± implementacjê architektury klient/serwer. @@ -345,24 +346,22 @@ X-Window Display PostScript static libraries. Statyczne biblioteki X-Window Display PostScript. %package OpenGL-core -Summary: OpenGL support for X11R6 -Summary(pl): Wsparcie OpenGL dla systemu X11R6 -Group: X11/Libraries -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: XFree86-OpenGL-libGL -Obsoletes: XFree86-driver-nvidia +Summary: OpenGL support extension modules for Xserver +Summary(pl): Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL +Group: X11/Xserver +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description OpenGL-core -OpenGL support for X11R6 system. +OpenGL support extension modules for Xserver. %description OpenGL-core -l pl -Wsparcie OpenGL dla systemu X11R6. +Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL. %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Obsoletes: XFree86-driver-firegl Obsoletes: XFree86-driver-nvidia @@ -372,23 +371,22 @@ 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: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release} -Requires: %{name}-devel = %{epoch}:%{version}-%{release} -Requires: OpenGL-devel-base -Provides: OpenGL-devel -Obsoletes: Mesa-devel -Obsoletes: XFree86-OpenGL-doc -Obsoletes: glxMesa-devel +%package OpenGL-libs +Summary: OpenGL libraries for X11R6 +Summary(pl): Biblioteki OpenGL dla systemu X11R6 +Group: X11/Libraries +Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Provides: OpenGL = 1.4 +Provides: OpenGL-GLU = 1.3 +Provides: OpenGL-GLX = 1.4 +Obsoletes: Mesa +Obsoletes: XFree86-OpenGL -%description OpenGL-devel -Headers and man pages for OpenGL for X11R6. +%description OpenGL-libs +OpenGL libraries for X11R6 system. -%description OpenGL-devel -l pl -Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6. +%description OpenGL-libs -l pl +Biblioteki OpenGL dla systemu X11R6. %package OpenGL-devel-base Summary: OpenGL for X11R6 development (GL and GLX only) @@ -405,28 +403,33 @@ Base headers (GL and GLX only) for OpenGL for X11R6. %description OpenGL-devel-base -l pl Podstawowe pliki nag³ówkowe (tylko GL i GLX) OpenGL dla systemu X11R6. -%package OpenGL-libs -Summary: OpenGL libraries for X11R6 -Summary(pl): Biblioteki OpenGL dla systemu X11R6 -Group: X11/Libraries -Requires: %{name}-OpenGL-core -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Provides: OpenGL -Obsoletes: Mesa -Obsoletes: XFree86-OpenGL +%package OpenGL-devel +Summary: OpenGL for X11R6 development +Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 +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.4 +Provides: OpenGL-GLU-devel = 1.3 +Provides: OpenGL-GLX-devel = 1.4 +Obsoletes: Mesa-devel +Obsoletes: XFree86-OpenGL-doc +Obsoletes: glxMesa-devel -%description OpenGL-libs -OpenGL libraries for X11R6 system. +%description OpenGL-devel +Headers and man pages for OpenGL for X11R6. -%description OpenGL-libs -l pl -Biblioteki OpenGL dla systemu X11R6. +%description OpenGL-devel -l pl +Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6. %package OpenGL-static 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 +Provides: OpenGL-static = 1.4 +Provides: OpenGL-GLU-static = 1.3 Obsoletes: Mesa-static %description OpenGL-static @@ -545,7 +548,7 @@ pour de nombreux autres circuits et cartes. Essayez ce serveur si vous avez des problèmes. %description Xserver -l pl -Jest to podstawowy Xserwer wy¶wietlaj±cy obraz na karcie graficznej. +Jest to podstawowy X serwer wy¶wietlaj±cy obraz na karcie graficznej. Do dzia³ania wymaga odpowiedniego sterownika - sam pakiet zawiera tylko odpowiedni dla kart VGA oraz SVGA zgodnych z VESA (bez akceleracji). Inne sterowniki mo¿na znale¼æ w pakietach @@ -667,31 +670,22 @@ Obsoletes: xrender-devel %description devel Libraries, header files, and documentation for developing programs that run as X clients. It includes the base Xlib library as well as -the Xt and Xaw widget sets. For information on programming with these -libraries, PLD recommends the series of books on X Programming -produced by O'Reilly and Associates. +the Xt and Xaw widget sets. %description devel -l de Libraries, Header-Dateien und Dokumentation zum Entwickeln von Programmen, die als X-Clients laufen. Enthält die Xlib-Library und die -Widget-Sätze Xt und Xaw. Information zum Programmieren mit diesen -Libraries finden Sie in der Buchreihe zur X-Programmierung von -O'Reilly and Associates. +Widget-Sätze Xt und Xaw. %description devel -l fr Bibliothéques, fichiers d'en-tête, et documentation pour développer des programmes s'exécutant en clients X. Cela comprend la Bibliothéque -Xlib de base aussi bien que les ensembles de widgets Xt et Xaw. Pour -des informations sur la programmation avec ces Bibliothéques, Red Hat -recommande la série d'ouvrages sur la programmation X editée par -O'Reilly and Associates. +Xlib de base aussi bien que les ensembles de widgets Xt et Xaw. %description devel -l pl Pliki nag³ówkowe, dokumentcja dla programistów rozwijaj±cych aplikacje klienckie pod X Window. Zawiera podstawow± bibliotekê Xlib a tak¿e Xt -i Xaw. Wiêcej informacji nt. pisania programów przy u¿yciu tych -bibliotek mo¿esz znale¼æ w ksi±¿kach wydawnictwa O'Reilly and -Associates (X Programming) polecanych przez Red Hata. +i Xaw. %description devel -l ru XFree86-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ @@ -774,11 +768,15 @@ Sterownik do kart ATI. Summary: ATI Rage 128 video driver Summary(pl): Sterownik do kart ATI Rage 128 Group: X11/Servers -Requires: OpenGL Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} +%ifarch %{ix86} ia64 amd64 alpha ppc arm +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL +%endif Obsoletes: XFree86-Rage128 -Conflicts: XFree86-driver-nvidia %description driver-r128 ATI Rage 128 video driver. @@ -790,11 +788,15 @@ Sterownik do kart ATI Rage 128. Summary: ATI Radeon video driver Summary(pl): Sterownik do kart ATI Radeon Group: X11/Servers -Requires: OpenGL Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release} -Conflicts: XFree86-driver-nvidia +%ifarch %{ix86} ia64 amd64 alpha ppc arm +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL +%endif %description driver-radeon ATI Radeon video driver. @@ -890,10 +892,14 @@ Sterownik do kart Voodoo1 i Voodoo2 firmy 3Dfx. Summary: GLINT/Permedia video driver Summary(pl): Sterownik do kart GLINT i Permedia Group: X11/Servers -Requires: OpenGL Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} -Conflicts: XFree86-driver-nvidia +%ifarch %{ix86} ia64 amd64 alpha ppc arm +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL +%endif Obsoletes: XFree86-3DLabs %description driver-glint @@ -934,10 +940,14 @@ 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/Servers -Requires: OpenGL Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} -Conflicts: XFree86-driver-nvidia +%ifarch %{ix86} ia64 +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL +%endif Obsoletes: XFree86-i810 %description driver-i810 @@ -963,10 +973,14 @@ Sterownik do kart Integrated Micro Solutions Twin Turbo 128. Summary: Matrox video driver Summary(pl): Sterownik do kart Matrox Group: X11/Servers -Requires: OpenGL Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} -Conflicts: XFree86-driver-nvidia +%ifarch %{ix86} ia64 amd64 alpha ppc arm +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL +%endif Obsoletes: XFree86-mga %description driver-mga @@ -1108,6 +1122,12 @@ Summary(pl): Sterownik do kart na uk Group: X11/Servers Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} +%ifarch %{ix86} ia64 +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL +%endif Obsoletes: XFree86-SiS %description driver-sis @@ -1214,11 +1234,15 @@ Summary(pl): Sterownik do kart 3Dfx Group: X11/Servers Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} +%ifarch %{ix86} ia64 alpha arm ppc +# for dri +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release} +# -libs already required by -OpenGL-libGL # dlopens libglide3x.so Requires: Glide3-DRI -Requires: OpenGL +%endif Obsoletes: XFree86-3dfx -Conflicts: XFree86-driver-nvidia %description driver-tdfx 3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5. @@ -1264,7 +1288,8 @@ Summary(pl): Sterownik do kart Tseng Labs Group: X11/Servers Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Requires: %{name}-modules = %{epoch}:%{version}-%{release} -Obsoletes: XFree86-Tseng XFree86-W32 +Obsoletes: XFree86-Tseng +Obsoletes: XFree86-W32 %description driver-tseng Tseng Labs video driver. @@ -1417,6 +1442,8 @@ XFree86-xfs. Summary: Modules with X servers extensions Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ Group: X11/Servers +Obsoletes: XFree86-module-PEX +Obsoletes: XFree86-module-XIE %description modules Modules with X servers extensions. @@ -1564,7 +1591,6 @@ Summary: Cursors Theme "handhelds" Summary(pl): Motyw kursorów "handhelds" Group: Themes Requires: XFree86-libs -Requires: xcursor Conflicts: XFree86 < 4.3.99.901-0.2 %description -n XcursorTheme-handhelds @@ -1578,7 +1604,6 @@ Summary: Cursors theme "redglass" Summary(pl): Motyw kursorów "redglass" Group: Themes Requires: XFree86-libs -Requires: xcursor Conflicts: XFree86 < 4.3.99.901-0.2 %description -n XcursorTheme-redglass @@ -1592,7 +1617,6 @@ Summary: Cursors theme "whiteglass" Summary(pl): Motyw kursorów "whiteglass" Group: Themes Requires: XFree86-libs -Requires: xcursor Conflicts: XFree86 < 4.3.99.901-0.2 %description -n XcursorTheme-whiteglass @@ -1691,7 +1715,7 @@ granting access to other users). %description xauth -l pl Program xauth s³u¿y do edycji i wy¶wietlania informacji -autoryzacyjnych u¿ywanych przy ³±czeniu z Xserwerem. Ten program +autoryzacyjnych u¿ywanych przy ³±czeniu z X serwerem. Ten program przewa¿nie jest u¿ywany do wyci±gania rekordów autoryzacji z jednej maszyny i do³±czania ich na innej (w celu umo¿liwienia zdalnego logowania lub udostêpnienia innym u¿ytkownikom). @@ -1711,9 +1735,10 @@ Requires: %{name}-sessreg = %{epoch}:%{version}-%{release} Requires: /usr/X11R6/bin/sessreg Provides: XDM Provides: xdm = %{epoch}:%{version}-%{release} -Obsoletes: X11-xdm +Obsoletes: entrance Obsoletes: gdm Obsoletes: kdm +Obsoletes: wdm Obsoletes: xdm %description xdm @@ -1868,8 +1893,8 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi $RPM_BUILD_ROOT/usr/{bin,include,lib} \ $RPM_BUILD_ROOT/var/{log,lib/xkb} \ $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \ - $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \ - $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir}} \ + $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial,Bluecurve}} \ + $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \ $RPM_BUILD_ROOT%{_pkgconfigdir} %{__make} -C xc install install.man \ @@ -1987,6 +2012,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html # resolve conflict with man-pages 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 + %ifnarch sparc sparc64 gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/* @@ -2009,13 +2037,13 @@ rm -rf $RPM_BUILD_ROOT #--- %post{un}, %preun, %verifyscript, %trigge ---------- -%post DPS -p /sbin/ldconfig +%post DPS -p /sbin/ldconfig %postun DPS -p /sbin/ldconfig -%post OpenGL-libGL -p /sbin/ldconfig +%post OpenGL-libGL -p /sbin/ldconfig %postun OpenGL-libGL -p /sbin/ldconfig -%post OpenGL-libs -p /sbin/ldconfig +%post OpenGL-libs -p /sbin/ldconfig %postun OpenGL-libs -p /sbin/ldconfig %post libs @@ -2070,22 +2098,8 @@ if [ "$1" = "0" ]; then fi %pre xfs -if [ -n "`/usr/bin/getgid xfs`" ]; then - if [ "`/usr/bin/getgid xfs`" != "56" ]; then - echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2 - exit 1 - fi -else - /usr/sbin/groupadd -g 56 -r -f xfs -fi -if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then - if [ "`/bin/id -u xfs`" != "56" ]; then - echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2 - exit 1 - fi -else - /usr/sbin/useradd -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs 1>&2 -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 %post xfs /sbin/chkconfig --add xfs @@ -2369,6 +2383,26 @@ fi %attr(755,root,root) /usr/%{_lib}/libGL.so.1 %attr(755,root,root) /usr/%{_lib}/libGL.so +%files OpenGL-libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/glxinfo +%attr(755,root,root) %{_bindir}/glxgears +%attr(755,root,root) %{_libdir}/libGLU.so.*.* +# to be fixed: it contains unresolved symbols and would need -lXm +#%attr(755,root,root) %{_libdir}/libGLw.so.*.* +%attr(755,root,root) %{_libdir}/libOSMesa.so.*.* +# Linux OpenGL ABI compatibility symlink +%attr(755,root,root) /usr/%{_lib}/libGLU.so.1 +%{_mandir}/man1/glxinfo.1* +%{_mandir}/man1/glxgears.1* + +%files OpenGL-devel-base +%defattr(644,root,root,755) +/usr/include/GL/gl.h +/usr/include/GL/glx.h +/usr/include/GL/glext.h +/usr/include/GL/glxtokens.h + %files OpenGL-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libGLU.so @@ -2391,26 +2425,6 @@ fi %{_mandir}/man3/glu* %{_mandir}/man3/GLw* -%files OpenGL-devel-base -%defattr(644,root,root,755) -/usr/include/GL/gl.h -/usr/include/GL/glx.h -/usr/include/GL/glext.h -/usr/include/GL/glxtokens.h - -%files OpenGL-libs -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/glxinfo -%attr(755,root,root) %{_bindir}/glxgears -%attr(755,root,root) %{_libdir}/libGLU.so.*.* -# to be fixed: it contains unresolved symbols and would need -lXm -#%attr(755,root,root) %{_libdir}/libGLw.so.*.* -%attr(755,root,root) %{_libdir}/libOSMesa.so.*.* -# Linux OpenGL ABI compatibility symlink -%attr(755,root,root) /usr/%{_lib}/libGLU.so.1 -%{_mandir}/man1/glxinfo.1* -%{_mandir}/man1/glxgears.1* - %files OpenGL-static %defattr(644,root,root,755) %{_libdir}/libGL.a @@ -2456,6 +2470,11 @@ fi %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/bdftopcf +%ifnarch ppc sparc sparc64 sparcv9 +%attr(755,root,root) %{_bindir}/ioport +%endif +%attr(755,root,root) %{_bindir}/mmapr +%attr(755,root,root) %{_bindir}/mmapw %attr(755,root,root) %{_bindir}/xcursor-config %attr(755,root,root) %{_bindir}/xft-config %attr(755,root,root) %{_libdir}/libFS.so @@ -2510,11 +2529,11 @@ fi %{_includedir}/X11/fonts %{_includedir}/xf86*.h %{_libx11dir}/config +%{_mandir}/man1/bdftopcf.1* +%{_mandir}/man3/[A-FH-Z]* %{_pkgconfigdir}/xcursor.pc %{_pkgconfigdir}/xft.pc %{_pkgconfigdir}/xrender.pc -%{_mandir}/man1/bdftopcf.1* -%{_mandir}/man3/[A-FH-Z]* %files Xserver-devel %defattr(644,root,root,755) @@ -2617,7 +2636,7 @@ fi %{_mandir}/man4/imstt.4* %endif -%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64 +%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha ppc arm %files driver-mga %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o @@ -2834,6 +2853,9 @@ fi %dir %{_themesdir} %dir %{_themesdir}/Default %dir %{_themesdir}/ThinIce +%dir %{_themesdir}/Metal +%dir %{_themesdir}/Industrial +%dir %{_themesdir}/Bluecurve %{_libx11dir}/XErrorDB %{_libx11dir}/XKeysymDB %dir %{_appdefsdir} @@ -2869,6 +2891,7 @@ fi %dir %{_wallpapersdir} %dir %{_wmpropsdir} %dir %{_xsessdir} +%dir %{_wmstylesdir} %attr(755,root,root) %{_libdir}/libFS.so.*.* %attr(755,root,root) %{_libdir}/libI810XvMC.so.*.* %attr(755,root,root) %{_libdir}/libICE.so.*.* @@ -2992,9 +3015,9 @@ fi %{_libdir}/libXaw.a %{_libdir}/libXcursor.a %{_libdir}/libXext.a -%{_libdir}/libXft.a %{_libdir}/libXfont.a %{_libdir}/libXfontcache.a +%{_libdir}/libXft.a %{_libdir}/libXi.a %{_libdir}/libXinerama.a %{_libdir}/libXmu.a