Index: SUNWxscreensaver.spec
===================================================================
--- SUNWxscreensaver.spec (revision 20323)
+++ SUNWxscreensaver.spec (working copy)
@@ -24,7 +24,7 @@
%define rss_url %{sf_download}/rss-glx
%define rss_dir %{rss_name}_%{rss_version}
-%define x11_dir /usr/X11
+%define app_defaults_dir %{_datadir}/X11/app-defaults
%define xss_libdir %{_libdir}/xscreensaver
Name: SUNWxscreensaver
@@ -468,7 +468,7 @@
--with-configdir=%{xss_libdir}/config/control-center-2.0 \
--with-image-directory=%{_datadir}/pixmaps/backgrounds \
--with-text-file=/etc/motd \
- --with-x-app-defaults=%{x11_dir}/lib/X11/app-defaults
+ --with-x-app-defaults=%{app_defaults_dir}
# Update potfiles.in to pick up our added sources like lock-Gtk.c
cd po
@@ -531,7 +531,8 @@
# Run script to add rss-glx hacks to XScreenSaver app-defaults, then delete it
${RPM_BUILD_ROOT}%{xss_libdir}/hacks/rss-glx_install.pl \
- ${RPM_BUILD_ROOT}%{x11_dir}/lib/X11/app-defaults/XScreenSaver
+ ${RPM_BUILD_ROOT}%{app_defaults_dir}/XScreenSaver
+chmod 0444 ${RPM_BUILD_ROOT}%{app_defaults_dir}/XScreenSaver
rm ${RPM_BUILD_ROOT}%{xss_libdir}/hacks/rss-glx_install.pl
# Make compatibility links for SUNWxwsvr
@@ -548,7 +549,7 @@
ln -s ../../lib/xscreensaver usr/openwin/lib
install -m 755 -d usr/openwin/lib/app-defaults
-ln -s ../../../X11/lib/X11/app-defaults/XScreenSaver \
+ln -s ../../../share/X11/app-defaults/XScreenSaver \
usr/openwin/lib/app-defaults
# Make compatibility links for SUNWxscreensaver
@@ -563,6 +564,10 @@
install -m 755 -d usr/X11/lib
ln -s ../../lib/xscreensaver usr/X11/lib
+install -m 755 -d usr/X11/lib/X11/app-defaults
+ln -s ../../../../share/X11/app-defaults/XScreenSaver \
+ usr/X11/lib/X11/app-defaults
+
# This function prints a list of things that get installed.
# It does this by parsing the output of a dummy run of "make install".
# Borrowed/modified from Fedora Project RPM for xscreensaver at
@@ -647,11 +652,12 @@
%dir %attr(0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/xscreensaver*.1
-%dir %attr(0755, root, bin) /usr/X11/lib/X11
-%dir %attr(0755, root, bin) /usr/X11/lib/X11/app-defaults
-/usr/X11/lib/X11/app-defaults/XScreenSaver
+%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, sys) %{_datadir}
+%dir %attr(0755, root, bin) %{_datadir}/X11
+%dir %attr(0755, root, bin) %{app_defaults_dir}
+%{app_defaults_dir}/XScreenSaver
+
%dir %attr(0755, root, other) %{_datadir}/applications
%{_datadir}/applications/screensaver-properties.desktop
@@ -659,11 +665,15 @@
%{_datadir}/pixmaps/xscreensaver.xpm
# compatibility links for old /usr/X11 paths
+%define x11_dir /usr/X11
%dir %attr(0755, root, bin) %{x11_dir}
%dir %attr(0755, root, bin) %{x11_dir}/bin
%{x11_dir}/bin/*
%dir %attr(0755, root, bin) %{x11_dir}/lib
%{x11_dir}/lib/xscreensaver
+%dir %attr(0755, root, bin) %{x11_dir}/lib/X11
+%dir %attr(0755, root, bin) %{x11_dir}/lib/X11/app-defaults
+%{x11_dir}/lib/X11/app-defaults/XScreenSaver
%files -f hacks.files hacks
@@ -684,6 +694,7 @@
%changelog
* Wed Dec 23 2009 - alan.coopersmith at sun.com
+- Move app-defaults file to /usr/share/X11/app-defaults
- Build against mesa headers/libraries on both SPARC & x86 now that
SUNWxorg-mesa is delivered on SPARC in snv_130
- Report error if none of the GL hacks were built instead of quietly
--
-Alan Coopersmith- alan.coopersmith at sun.com
Sun Microsystems, Inc. - X Window System Engineering
