2008-09-06 Christian Kelly <
[email protected]>
* patches/gnome-applets-01-disable-drivemount.diff: Remove hunk.
* SUNWgnome-applets.spec: rm the drivemount stuff, as it we don't seem
to ship it.
* base-specs/gnome-applets.spec: Bump to 2.23.91.
--- a/ChangeLog Sat Sep 06 19:52:27 2008 +0000
+++ b/ChangeLog Sat Sep 06 20:18:00 2008 +0000
@@ -1,3 +1,9 @@
+2008-09-06 Christian Kelly <[email protected]>
+ * patches/gnome-applets-01-disable-drivemount.diff: Remove hunk.
+ * SUNWgnome-applets.spec: rm the drivemount stuff, as it we don't seem
+ to ship it.
+ * base-specs/gnome-applets.spec: Bump to 2.23.91.
+
2008-09-06 Christian Kelly <[email protected]>
* base-specs/gtk2.spec: Bump to 2.14.1.
@@ -19,6 +25,7 @@
gnome-screenshot failing to capture second screen in xinerama mode.
* patches/gnome-utils-08-xinerama-screenshot.diff : New Patch
* patches/gnome-utils-xx-logviewer-manpages.diff : Renamed to 07 as all
+2008-09-06 Christian Kelly <[email protected]>
patches should have associated patch numbers.
2008-09-05 Jerry Yu <[email protected]>
--- a/SUNWgnome-applets.spec Sat Sep 06 19:52:27 2008 +0000
+++ b/SUNWgnome-applets.spec Sat Sep 06 20:18:00 2008 +0000
@@ -215,6 +215,14 @@
rm -r $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/en_GB
rm -r $RPM_BUILD_ROOT%{_datadir}/omf/*/*-en_GB.omf
+# Remove the drivemount files
+rm $RPM_BUILD_ROOT%{_datadir}/omf/drivemount/drivemount-C.omf
+rm -r $RPM_BUILD_ROOT%{_datadir}/gnome/help/drivemount
+rm $RPM_BUILD_ROOT%{_libdir}/drivemount_applet2
+rm $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/drivemount.schemas
+rm $RPM_BUILD_ROOT%{_datadir}/gnome-2.0/ui/GNOME_DriveMountApplet.xml
+rm $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_DriveMountApplet.server
+
%if %build_l10n
%else
# REMOVE l10n FILES
@@ -409,7 +417,11 @@
%{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
%{_datadir}/gnome-2.0/ui/Invest_Applet.xml
%dir %attr (0755, root, other) %{_datadir}/pixmaps
-%{_datadir}/pixmaps/invest-48_neutral.png
+#%{_datadir}/pixmaps/invest-48_neutral.png
+%{_datadir}/icons/hicolor/48x48/apps/invest-applet.png
+%{_datadir}/icons/hicolor/16x16/apps/invest-applet.png
+%{_datadir}/icons/hicolor/scalable/apps/invest-applet.svg
+%{_datadir}/icons/hicolor/22x22/apps/invest-applet.png
%files -n SUNWgnome-intranet-applets
%defattr (-, root, bin)
--- a/base-specs/gnome-applets.spec Sat Sep 06 19:52:27 2008 +0000
+++ b/base-specs/gnome-applets.spec Sat Sep 06 20:18:00 2008 +0000
@@ -9,7 +9,7 @@
Name: gnome-applets
License: GPL
Group: System/GUI/GNOME
-Version: 2.23.90
+Version: 2.23.91
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -139,6 +139,8 @@
%{_datadir}/pixmaps/*
%changelog
+* Sat Sep 06 2008 - [email protected]
+- Bump to 2.23.91.
* Thu Aug 28 2008 - [email protected]
- Remove patch 06-fixsticky.diff, applied upstream
- Add patch 06-accessx-crash.diff : Fixes : 6741535
--- a/patches/gnome-applets-01-disable-drivemount.diff Sat Sep 06 19:52:27 2008 +0000
+++ b/patches/gnome-applets-01-disable-drivemount.diff Sat Sep 06 20:18:00 2008 +0000
@@ -1,15 +1,5 @@
--- gnome-applets-2.23.4/Makefile.am.orig 2006-01-31 23:27:12.982099000 +0000
+++ gnome-applets-2.23.4/Makefile.am 2006-01-31 23:27:24.001982000 +0000
-@@ -11,8 +11,7 @@
- libgweather_SUBDIRS = $(libgweather_applets)
- endif
-
--vfs_applets = \
-- drivemount
-+vfs_applets =
- if BUILD_GNOME_VFS_APPLETS
- vfs_SUBDIRS = $(vfs_applets)
- endif
@@ -65,7 +64,6 @@
po \
mixer \