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
%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
%patch22 -p1
%patch23 -p1
%patch24 -p1
-#%patch25 -p0
+
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
#%patch28 -p1 -- needs update
%endif
-#%patch29 -p0 -- needs update
+%patch29 -p0
%patch30 -p1
%patch32 -p1
%patch33 -p1
$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" \
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
%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