solaris-lockscreen-logos-1.0.tar.bz2 has just been submitted to the tarballs
server in Ireland.
-alan-
Index: ChangeLog
===================================================================
--- ChangeLog (revision 18934)
+++ ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2009-07-30 Alan Coopersmith <alan.coopersmith at sun.com>
+
+ * SUNWxscreensaver.spec:
+ move Solaris branding logos to solaris-lockscreen-logos-1.0.tar.bz2
+
2009-07-30 Brian Cameron <brian.cameron at sun.com>
* SUNWgnome-media-apps.spec, copyright/SUNWgnome-media-apps.copyright,
Index: SUNWxscreensaver.spec
===================================================================
--- SUNWxscreensaver.spec (revision 18934)
+++ SUNWxscreensaver.spec (working copy)
@@ -37,11 +37,10 @@
Source1: %{rss_url}/%{rss_dir}.tar.bz2
Source2: xscreensaver-opensolaris-logo.png
%if %option_with_sun_branding
-Source3: xscreensaver-unlock-logo.png
-Source4: xscreensaver-trusted-logo.png
+Source3: solaris-lockscreen-logos-1.0.tar.bz2
%endif
-Source5: suntouch-manpages.pl
-Source6: map.noexbss
+Source4: suntouch-manpages.pl
+Source5: map.noexbss
# date:2008-12-15 owner:alanc type:bug bugster:6785377 state:upstream
Patch1: xscreensaver-01-datarootdir.diff
@@ -321,8 +320,9 @@
cp %SOURCE2 driver/opensolaris-logo.png
%if %option_with_sun_branding
-cp %SOURCE3 driver/unlock-logo.png
-cp %SOURCE4 driver/trusted-logo.png
+bzcat %SOURCE3 | tar xf -
+mv solaris-lockscreen-logos/unlock-logo.png driver/unlock-logo.png
+mv solaris-lockscreen-logos/trusted-logo.png driver/trusted-logo.png
%else
ln -s opensolaris-logo.png driver/unlock-logo.png
ln -s opensolaris-logo.png driver/trusted-logo.png
@@ -331,7 +331,7 @@
# Adjust man pages to Solaris standards:
# - add paths to synopsis
# - add attributes section to end with package info & stability
-%define suntouch_manpages_cmd /usr/perl5/bin/perl %SOURCE5
+%define suntouch_manpages_cmd /usr/perl5/bin/perl %SOURCE4
%{suntouch_manpages_cmd} \
-a '{Availability, %{name}}' \
-a '{Interface Stability, Volatile}' \
@@ -388,7 +388,7 @@
# so that it's harder for attackers to exploit buffer overflows
# SPARC architecture requires PLT section in .data be executable, so
# we can only make .bss, not all of .data no-exec on SPARC
-%define mapfile_noexbss -Wl,-M,%SOURCE6
+%define mapfile_noexbss -Wl,-M,%SOURCE5
%ifarch sparc
%define mapfile_noexdata %{mapfile_noexbss}
%else
@@ -629,6 +629,8 @@
%endif
%changelog
+* Thu Jul 30 2009 - alan.coopersmith at sun.com
+- move Solaris branding logos to solaris-lockscreen-logos-1.0.tar.bz2
* Fri Jul 24 2009 - alan.coopersmith at sun.com
- rename patches from *.patch to *.diff
* Fri Jul 17 2009 - alan.coopersmith at sun.com
