2006-07-21 Dermot McCluskey - <
[email protected]>
* gnome-applets.spec: bumped to 2.15.1.1.
* patches/gnome-applets-01-disable-drivemount.diff: reworked
* patches/gnome-applets-04-prefer-sdtaudiocontrol.diff: reworked
* patches/gnome-applets-05-disable-keyboard-layout.diff: reworked
--- a/ChangeLog Fri Jul 21 09:08:20 2006 +0000
+++ b/ChangeLog Fri Jul 21 09:57:45 2006 +0000
@@ -1,3 +1,10 @@
+2006-07-21 Dermot McCluskey - <[email protected]>
+
+ * gnome-applets.spec: bumped to 2.15.1.1.
+ * patches/gnome-applets-01-disable-drivemount.diff: reworked
+ * patches/gnome-applets-04-prefer-sdtaudiocontrol.diff: reworked
+ * patches/gnome-applets-05-disable-keyboard-layout.diff: reworked
+
2006-07-21 Henry Zhang <[email protected]>
* patches/gnome-system-monitor-01-solaris.diff: fix a monitor bug
--- a/gnome-applets.spec Fri Jul 21 09:08:20 2006 +0000
+++ b/gnome-applets.spec Fri Jul 21 09:57:45 2006 +0000
@@ -8,12 +8,12 @@
Name: gnome-applets
License: GPL
Group: System/GUI/GNOME
-Version: 2.14.1
+Version: 2.15.1.1
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: GNOME Applets
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.14/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.15/%{name}-%{version}.tar.bz2
Patch1: gnome-applets-01-disable-drivemount.diff
Patch2: gnome-applets-02-mini-commander-tooltip.diff
Patch3: gnome-applets-03-non-utf8-date-title.diff
@@ -115,6 +115,9 @@
%{_datadir}/pixmaps/*
%changelog
+* Web Jul 21 2006 - [email protected]
+- Bump to 2.15.1.1.
+
* Sat Jul 15 2006 - [email protected]
- Add patch to remove all the keyboard layout features.
--- a/patches/gnome-applets-01-disable-drivemount.diff Fri Jul 21 09:08:20 2006 +0000
+++ b/patches/gnome-applets-01-disable-drivemount.diff Fri Jul 21 09:57:45 2006 +0000
@@ -5,9 +5,9 @@
vfs_applets = \
- drivemount \
- gtik \
libgweather \
gweather \
+ trashapplet
@@ -65,7 +64,6 @@
po \
mixer \
--- a/patches/gnome-applets-04-prefer-sdtaudiocontrol.diff Fri Jul 21 09:08:20 2006 +0000
+++ b/patches/gnome-applets-04-prefer-sdtaudiocontrol.diff Fri Jul 21 09:57:45 2006 +0000
@@ -2,9 +2,9 @@
--- gnome-applets-2.14.1-orig/configure.in 2006-05-04 13:31:35.856808000 +0100
+++ gnome-applets-2.14.1/configure.in 2006-05-16 17:06:45.674966000 +0100
@@ -385,6 +385,20 @@
- AC_SUBST(MIXER_CFLAGS)
- AC_SUBST(MIXER_LIBS)
-
+ AC_SUBST(LIBWNCK_CFLAGS)
+ AC_SUBST(LIBWNCK_LIBS)
+
+AC_MSG_CHECKING([if building on Solaris])
+case "$host" in
+ *solaris*)
@@ -19,16 +19,16 @@
+
+esac
+
- dnl ***************************************
- dnl ** Check for libnotify **
- dnl ***************************************
+ dnl -- check for libnotify (optional) -----------------------------------------
+ LIBNOTIFY_CFLAGS=
+ LIBNOTIFY_LIBS=
diff -urN --ignore-space-change -Xdiff-excludes.txt -b gnome-applets-2.14.1-orig/mixer/GNOME_MixerApplet.xml gnome-applets-2.14.1/mixer/GNOME_MixerApplet.xml
--- gnome-applets-2.14.1-orig/mixer/GNOME_MixerApplet.xml 2006-05-04 13:31:36.753104000 +0100
+++ gnome-applets-2.14.1/mixer/GNOME_MixerApplet.xml 2006-05-16 18:40:29.455749000 +0100
@@ -2,7 +2,7 @@
<popups>
<popup name="button3">
- <menuitem name="Mute" verb="Mute" _label="_Mute" type="toggle" accel="*Control*m"/>
+ <menuitem name="Mute" verb="Mute" _label="Mu_te" type="toggle" accel="*Control*t"/>
- <menuitem name="RunMixer" verb="RunMixer" _label="_Open Volume Control" accel="*Control*o"/>
+ <menuitem name="RunMixer" verb="RunMixer" _label="_Open Audio Control" accel="*Control*o"/>
<separator/>
--- a/patches/gnome-applets-05-disable-keyboard-layout.diff Fri Jul 21 09:08:20 2006 +0000
+++ b/patches/gnome-applets-05-disable-keyboard-layout.diff Fri Jul 21 09:57:45 2006 +0000
@@ -1,16 +1,18 @@
-diff -urN gnome-applets-2.14.1/Makefile.am gnome-applets-2.14.1-hacked/Makefile.am
---- gnome-applets-2.14.1/Makefile.am 2006-01-30 20:15:56.000000000 +1300
-+++ gnome-applets-2.14.1-hacked/Makefile.am 2006-07-15 08:09:18.733632000 +1200
-@@ -35,8 +35,6 @@
+diff -urN gnome-applets-2.15.1.1/Makefile.am gnome-applets-2.15.1.1-new/Makefile.am
+--- gnome-applets-2.15.1.1/Makefile.am Sat Jun 17 11:36:47 2006
++++ gnome-applets-2.15.1.1-new/Makefile.am Fri Jul 21 10:44:50 2006
+@@ -34,10 +34,6 @@
accessx_status_SUBDIR = accessx-status
endif
+-if BUILD_GSWITCHIT
-gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit
+-endif
-
if BUILD_CPUFREQ_APPLET
cpufreq_SUBDIR = cpufreq
endif
-@@ -45,7 +43,6 @@
+@@ -50,7 +46,6 @@
charpick \
geyes \
mini-commander \
@@ -18,23 +20,23 @@
stickynotes \
null_applet
-@@ -58,7 +55,6 @@
+@@ -63,7 +58,6 @@
$(vfs_SUBDIRS) \
$(battstat_SUBDIR) \
$(accessx_status_SUBDIR)\
- $(gswitchit_SUBDIRS) \
+ $(invest_applet_SUBDIR) \
$(cpufreq_SUBDIR)
- DIST_SUBDIRS = \
-@@ -69,7 +65,6 @@
+@@ -75,7 +69,6 @@
charpick \
geyes \
mini-commander \
- gkb-new \
battstat \
multiload \
- gtik \
-@@ -79,8 +74,6 @@
+ libgweather \
+@@ -84,8 +77,6 @@
accessx-status \
stickynotes \
libkbdraw \
@@ -42,18 +44,15 @@
- gswitchit \
trashapplet \
cpufreq \
- null_applet
-diff -urN gnome-applets-2.14.1/configure.in gnome-applets-2.14.1-hacked/configure.in
---- gnome-applets-2.14.1/configure.in 2006-04-10 20:43:56.000000000 +1200
-+++ gnome-applets-2.14.1-hacked/configure.in 2006-07-15 08:10:15.568991000 +1200
-@@ -174,34 +174,6 @@
- AC_SUBST(LIBWNCK_CFLAGS)
- AC_SUBST(LIBWNCK_LIBS)
+ invest-applet \
+diff -urN gnome-applets-2.15.1.1/configure.in gnome-applets-2.15.1.1-new/configure.in
+--- gnome-applets-2.15.1.1/configure.in Sun Jun 18 03:27:20 2006
++++ gnome-applets-2.15.1.1-new/configure.in Fri Jul 21 10:50:02 2006
+@@ -312,37 +312,6 @@
+ , enable_flags=no)
+ AM_CONDITIONAL(ENABLE_FLAGS, test x$enable_flags != xno)
--dnl ==============
--dnl gswitchit
--dnl ==============
--dnl Make sure the new cvs virtual include has been checked out
+-dnl -- make sure the cvs virtual includes have been checked out ---------------
-AC_MSG_CHECKING([for inclusion of libgswitchit])
-if test ! -d "$srcdir/libgswitchit"; then
- AC_MSG_RESULT(no)
@@ -78,23 +77,16 @@
-
-AM_CONDITIONAL(INCLUDE_GSWITCHIT_DEVEL, true) dnl pull devel from applet
-
- dnl ************************
- dnl ** Set up gettext **
- dnl ************************
-@@ -250,12 +222,6 @@
- AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")
- AC_SUBST(HAVE_JW)
-
-case "$host" in
--sparc-*-solaris*) gkb_type_sun=true;;
--*) gkb_type_sun=false;;
+- sparc-*-solaris*) gkb_type_sun=true;;
+- *) gkb_type_sun=false;;
-esac
-AM_CONDITIONAL(GKB_SUN, $gkb_type_sun)
-
- dnl ******************************************
- dnl ** battstat check **
- dnl ******************************************
-@@ -621,9 +587,6 @@
+ dnl ***************************************************************************
+ dnl *** battstat specific checks ***
+ dnl ***************************************************************************
+@@ -683,9 +652,6 @@
modemlights/Makefile
multiload/Makefile
multiload/docs/Makefile
@@ -103,8 +95,8 @@
-gkb-new/xmodmap.sun/Makefile
charpick/Makefile
charpick/help/Makefile
- gtik/Makefile
-@@ -644,11 +607,6 @@
+ invest-applet/Makefile
+@@ -708,11 +674,6 @@
stickynotes/Makefile
stickynotes/pixmaps/Makefile
stickynotes/docs/Makefile
@@ -116,13 +108,13 @@
trashapplet/Makefile
trashapplet/src/Makefile
trashapplet/docs/Makefile
-@@ -677,7 +635,6 @@
+@@ -744,7 +705,6 @@
- enabling suid bit $suid
- drivemount $build_gnome_vfs_applets
- geyes always
-- - gswitchit always
- - gtik $build_gnome_vfs_applets
+- - gswitchit $HAVE_LIBXKLAVIER
- gweather $build_gnome_vfs_applets
+ - invest-applet $BUILD_INVEST_APPLET
- mini-commander $enable_mini_commander
diff -urN gnome-applets-2.14.1/null_applet/GNOME_KeyboardApplet.server.in gnome-applets-2.14.1-hacked/null_applet/GNOME_KeyboardApplet.server.in
--- gnome-applets-2.14.1/null_applet/GNOME_KeyboardApplet.server.in 1970-01-01 12:00:00.000000000 +1200