Index: ChangeLog
===================================================================
--- ChangeLog (revision 20856)
+++ ChangeLog (working copy)
@@ -1,3 +1,11 @@
+2010-03-01 Alan Coopersmith <alan.coopersmith at sun.com>
+
+ * SUNWxscreensaver.spec, patches/xscreensaver-05-solaris-paths.diff:
+ - Use new IPS package names in man page attributes setting in .spec
+ and in hacks packages message in xscreensaver-05-solaris-paths.diff
+ - Fix http://defect.opensolaris.org/bz/show_bug.cgi?id=14955 in
+ xscreensaver-05-solaris-paths.diff
+
2010-03-01 Brian Cameron <brian.cameron at sun.com>
* base-specs/libcanberra.spec, patches/libcanberra-01-solaris.diff:
Index: SUNWxscreensaver.spec
===================================================================
--- SUNWxscreensaver.spec (revision 20856)
+++ SUNWxscreensaver.spec (working copy)
@@ -1,9 +1,16 @@
#
-# spec file for packages SUNWxscreensaver, SUNWxscreensaver-hacks,
SUNWxscreensaver-hacks-gl, SUNWxwsvr, SUNWrss-glx
+# spec file for xscreensaver packages
#
+# SVR4 names: pkg(5)/IPS names:
+# SUNWxscreensaver desktop/xscreensaver
+# SUNWxscreensaver-hacks desktop/xscreensaver/hacks
+# SUNWxscreensaver-hacks-gl desktop/xscreensaver/hacks/hacks-gl
+# SUNWrss-glx desktop/xscreensaver/hacks/rss-glx
+# SUNWxwsvr <obsolete>
+#
# includes module(s): xscreensaver, rss-glx
#
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright 2010 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# packages are under the same license as the packages themselves.
#
@@ -19,12 +26,19 @@
%define src_url http://dlc.sun.com/osol/x/downloads/mirrors
%define src_dir %{src_name}-%{src_version}
+%define pkg5_name_base desktop/xscreensaver
+%define pkg5_name_hacks desktop/xscreensaver/hacks
+%define pkg5_name_hacks_gl desktop/xscreensaver/hacks/hacks-gl
+%define pkg5_name_hacks_rss desktop/xscreensaver/hacks/rss-glx
+
%{?sf_download:#}%define sf_download http://downloads.sourceforge.net
%define rss_name rss-glx
%define rss_version 0.9.0
%define rss_url %{sf_download}/rss-glx
%define rss_dir %{rss_name}_%{rss_version}
+%define rss_OSR 4342:0.8.1
+
%define app_defaults_dir %{_datadir}/X11/app-defaults
%define xss_libdir %{_libdir}/xscreensaver
@@ -358,25 +372,25 @@
# - add attributes section to end with package info & stability
%define suntouch_manpages_cmd /usr/perl5/bin/perl %SOURCE4
%{suntouch_manpages_cmd} \
- -a '{Availability, %{name}}' \
+ -a '{Availability, %{pkg5_name_base}}' \
-a '{Interface Stability, Volatile}' \
-p %{_prefix}/bin/ \
driver/xscreensaver.man \
driver/xscreensaver-command.man \
driver/xscreensaver-demo.man
%{suntouch_manpages_cmd} \
- -a '{Availability, %{name}}' \
+ -a '{Availability, %{pkg5_name_base}}' \
-a '{Interface Stability, Private}' \
-p %{xss_libdir}/bin/ \
driver/xscreensaver-get*.man \
driver/xscreensaver-text.man
%{suntouch_manpages_cmd} \
- -a '{Availability, %{name}-hacks}' \
+ -a '{Availability, %{pkg5_name_hacks}}' \
-a '{Interface Stability, Private}' \
-p %{xss_libdir}/hacks/ \
hacks/*.man
%{suntouch_manpages_cmd} \
- -a '{Availability, %{name}-hacks-gl}' \
+ -a '{Availability, %{pkg5_name_hacks_gl}}' \
-a '{Interface Stability, Private}' \
-p %{xss_libdir}/hacks/ \
hacks/glx/*.man
@@ -387,7 +401,7 @@
%patch102 -p1
%{suntouch_manpages_cmd} \
- -a '{Availability, SUNWrss-glx}' \
+ -a '{Availability, %{pkg5_name_hacks_rss}}' \
-a '{Interface Stability, Private}' \
-p %{xss_libdir}/hacks/ \
src/*.1
@@ -711,6 +725,11 @@
%endif
%changelog
+* Mon Mar 1 2010 - alan.coopersmith at sun.com
+- Use new IPS package names in man page attributes setting in .spec file
+ and in hacks packages message in xscreensaver-05-solaris-paths.diff
+- Fix http://defect.opensolaris.org/bz/show_bug.cgi?id=14955 in
+ xscreensaver-05-solaris-paths.diff
* Mon Feb 15 2010 - arvind.umrao at sun.com
- Add xscreensaver-53-bug-6924996.diff to fix CR#6924996
* Thu Feb 04 2010 - harry.fu at sun.com
Index: patches/xscreensaver-05-solaris-paths.diff
===================================================================
--- patches/xscreensaver-05-solaris-paths.diff (revision 20856)
+++ patches/xscreensaver-05-solaris-paths.diff (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
@@ -208,14 +208,15 @@
diff -Nurp -x '*~' -x '*.orig'
xscreensaver-5.01/driver/xscreensaver-demo.glade2
xscreensaver-5.01/driver/xscreensaver-demo.glade2
--- xscreensaver-5.01/driver/xscreensaver-demo.glade2 2005-08-09
01:37:05.000000000 -0700
+++ xscreensaver-5.01/driver/xscreensaver-demo.glade2 2009-05-27
17:16:57.745729000 -0700
-@@ -820,8 +820,9 @@ Installed</property>
+@@ -820,8 +820,10 @@ Installed</property>
<property name="visible">True</property>
<property name="label" translatable="yes">Very
few (or no) screen
savers appear to be available.
-This probably means that the "xscreensaver-extras" and
-"xscreensaver-gl-extras" packages are not installed.</property>
-+This probably means that the "SUNWxscreensaver-hacks",
-+"SUNWxscreensaver-hacks-gl", and "SUNWrss-glx" packages
++This probably means that the "desktop/xscreensaver/hacks",
++"desktop/xscreensaver/hacks/hacks-gl", and
++"desktop/xscreensaver/hacks/rss-glx" packages
+are not installed.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
@@ -250,6 +251,21 @@
print "\n";
}
}
+diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/driver/xscreensaver.man
xscreensaver-5.01/driver/xscreensaver.man
+--- xscreensaver-5.01/driver/xscreensaver.man Tue Jan 5 08:50:56 2010
++++ xscreensaver-5.01/driver/xscreensaver.man Mon Mar 1 14:57:54 2010
+@@ -99,9 +99,8 @@
+ If you want to set the system-wide defaults, then make your edits to
+ the xscreensaver app-defaults file, which should have been installed
+ when xscreensaver itself was installed. The app-defaults file will
+-usually be named /usr/lib/X11/app-defaults/XScreenSaver, but different
+-systems might keep it in a different place (for example,
+-/usr/openwin/lib/app-defaults/XScreenSaver on Solaris.)
++usually be named /usr/share/X11/app-defaults/XScreenSaver, but different
++systems might keep it in a different place.
+
+ When settings are changed in the Preferences dialog box (see above)
+ the current settings will be written to the \fI.xscreensaver\fP file.
diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/hacks/glx/Makefile.in
xscreensaver-5.01/hacks/glx/Makefile.in
--- xscreensaver-5.01/hacks/glx/Makefile.in 2009-07-15 15:09:06.149902662
-0700
+++ xscreensaver-5.01/hacks/glx/Makefile.in 2009-07-15 15:20:22.012720200
-0700
