--- a/ChangeLog Mon Apr 05 12:55:31 2004 +0000
+++ b/ChangeLog Mon Apr 05 12:56:51 2004 +0000
@@ -1,3 +1,10 @@
+2004-04-05 Matt Keenan <[email protected]>
+
+ * gnome-applets.spec : bump to 2.6.0
+ * patches/gnome-applets-05-non_portable_CFLAGS.diff : remove
+ * patches/gnome-applets-03-mount-floppy-location.diff : Re-Apply
+ * patches/gnome-applets-06-g11n-schemas.diff : Rename to patch -05
+
2004-04-05 Ghee Teo <[email protected]>
* gst.spec: Updated majorminor version to 0.8
--- a/gnome-applets.spec Mon Apr 05 12:55:31 2004 +0000
+++ b/gnome-applets.spec Mon Apr 05 12:56:51 2004 +0000
@@ -1,8 +1,8 @@
Name: gnome-applets
License: GPL
Group: System/GUI/GNOME
-Version: 2.5.8
-Release: 8
+Version: 2.6.0
+Release: 1
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: GNOME Applets
@@ -14,8 +14,7 @@
Patch2: gnome-applets-02-gkb-window-icon-current.diff
Patch3: gnome-applets-03-mount-floppy-location.diff
Patch4: gnome-applets-04-g11n-i18n-ui.diff
-Patch5: gnome-applets-05-non_portable_CFLAGS.diff
-Patch6: gnome-applets-06-g11n-schemas.diff
+Patch5: gnome-applets-05-g11n-schemas.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/gnome-applets
@@ -49,8 +48,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1 -b .non_portable_CFLAGS
-%patch6 -p1
+%patch5 -p1
%build
libtoolize --force
@@ -161,6 +159,12 @@
%{_libexecdir}/*
%changelog
+* Mon Apr 05 2004 - [email protected]
+- Bump to 2.6.0
+- Re-apply patch 03-g18n..
+- Remove patch 05-non_portable_CFLAGS
+- Rename patch 06 -> to patch 05
+
* Thu Apr 01 2004 - [email protected]
- javahelp conversion
--- a/patches/gnome-applets-03-mount-floppy-location.diff Mon Apr 05 12:55:31 2004 +0000
+++ b/patches/gnome-applets-03-mount-floppy-location.diff Mon Apr 05 12:56:51 2004 +0000
@@ -1,5 +1,5 @@
---- ../gnome-applets-2.3.6.old/drivemount/properties.c 2003-08-11 15:39:58.000000000 +0100
-+++ ./drivemount/properties.c 2003-08-11 15:55:25.000000000 +0100
+--- ../gnome-applets-2.6.0.old/drivemount/properties.c 2004-04-05 13:39:26.000000000 +0100
++++ ./drivemount/properties.c 2004-04-05 13:43:36.000000000 +0100
@@ -112,12 +112,12 @@
dd->auto_eject = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "auto_eject", NULL);
dd->mount_point = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "mount_point", NULL);
@@ -15,8 +15,17 @@
dd->interval = 10;
}
g_object_unref (G_OBJECT (client));
---- ../gnome-applets-2.3.6.old/drivemount/drivemount.schemas.in 2003-08-11 15:39:58.000000000 +0100
-+++ ./drivemount/drivemount.schemas.in 2003-08-11 15:55:40.000000000 +0100
+@@ -371,7 +371,7 @@
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), widgets->mount_entry);
+ gnome_file_entry_set_filename (GNOME_FILE_ENTRY (widgets->mount_entry),
+ dd->mount_point);
+- gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (widgets->mount_entry), "/mnt/");
++ gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (widgets->mount_entry), "/media/");
+ gnome_file_entry_set_directory_entry(GNOME_FILE_ENTRY (widgets->mount_entry), TRUE);
+ entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (widgets->mount_entry));
+ gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+--- ../gnome-applets-2.6.0.old/drivemount/drivemount.schemas.in 2004-04-05 13:39:26.000000000 +0100
++++ ./drivemount/drivemount.schemas.in 2004-04-05 13:41:52.000000000 +0100
@@ -44,7 +44,7 @@
<key>/schemas/apps/drivemount-applet/prefs/mount_point</key>
<owner>drivemount-applet</owner>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-05-g11n-schemas.diff Mon Apr 05 12:56:51 2004 +0000
@@ -0,0 +1,104 @@
+diff -urN gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in
+--- gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in 2004-03-16 08:54:39.000000000 +0900
+@@ -0,0 +1,100 @@
++<gconfschemafile>
++ <schemalist>
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/secondary</key>
++ <applyto>/apps/gswitchit/Applet/secondary</applyto>
++ <owner>gswitchit</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>Secondary groups</short>
++ <long>Secondary groups</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/debugLevel</key>
++ <applyto>/apps/gswitchit/Applet/debugLevel</applyto>
++ <owner>gswitchit</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>Debug level</short>
++ <long>Debug level</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/beep</key>
++ <applyto>/apps/gswitchit/Applet/beep</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Beep on group switch</short>
++ <long>Beep on group switch</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/groupPerWindow</key>
++ <applyto>/apps/gswitchit/Applet/groupPerWindow</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Keep and manage separate group per window</short>
++ <long>Keep and manage separate group per window</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/handleIndicators</key>
++ <applyto>/apps/gswitchit/Applet/handleIndicators</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Save/restore indicators together with layout groups</short>
++ <long>Save/restore indicators together with layout groups</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/layoutNamesAsGroupNames</key>
++ <applyto>/apps/gswitchit/Applet/layoutNamesAsGroupNames</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Show layout names instead of group names</short>
++ <long>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/showFlags</key>
++ <applyto>/apps/gswitchit/Applet/showFlags</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Show flags in the applet</short>
++ <long>Show flags in the applet to indicate the current layout</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/defaultGroup</key>
++ <applyto>/apps/gswitchit/Applet/defaultGroup</applyto>
++ <owner>gswitchit</owner>
++ <type>int</type>
++ <default>-1</default>
++ <locale name="C">
++ <short>Default group, assigned on window creation</short>
++ <long>Default group, assigned on window creation</long>
++ </locale>
++ </schema>
++
++ </schemalist>
++</gconfschemafile>
--- a/patches/gnome-applets-05-non_portable_CFLAGS.diff Mon Apr 05 12:55:31 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- ../gnome-applets-2.5.6.old/stickynotes/Makefile.am 2004-02-23 14:18:27.000000000 +0000
-+++ ./stickynotes/Makefile.am 2004-02-23 14:18:49.000000000 +0000
-@@ -2,8 +2,6 @@
-
- SUBDIRS = pixmaps docs
-
--CFLAGS = -Wall -g
--
- INCLUDES = \
- -I. \
- -I$(srcdir) \
-
--- a/patches/gnome-applets-06-g11n-schemas.diff Mon Apr 05 12:55:31 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-diff -urN gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in
---- gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in 2004-03-16 08:54:39.000000000 +0900
-@@ -0,0 +1,100 @@
-+<gconfschemafile>
-+ <schemalist>
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/secondary</key>
-+ <applyto>/apps/gswitchit/Applet/secondary</applyto>
-+ <owner>gswitchit</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Secondary groups</short>
-+ <long>Secondary groups</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/debugLevel</key>
-+ <applyto>/apps/gswitchit/Applet/debugLevel</applyto>
-+ <owner>gswitchit</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Debug level</short>
-+ <long>Debug level</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/beep</key>
-+ <applyto>/apps/gswitchit/Applet/beep</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Beep on group switch</short>
-+ <long>Beep on group switch</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/groupPerWindow</key>
-+ <applyto>/apps/gswitchit/Applet/groupPerWindow</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Keep and manage separate group per window</short>
-+ <long>Keep and manage separate group per window</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/handleIndicators</key>
-+ <applyto>/apps/gswitchit/Applet/handleIndicators</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Save/restore indicators together with layout groups</short>
-+ <long>Save/restore indicators together with layout groups</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/layoutNamesAsGroupNames</key>
-+ <applyto>/apps/gswitchit/Applet/layoutNamesAsGroupNames</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Show layout names instead of group names</short>
-+ <long>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/showFlags</key>
-+ <applyto>/apps/gswitchit/Applet/showFlags</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Show flags in the applet</short>
-+ <long>Show flags in the applet to indicate the current layout</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/defaultGroup</key>
-+ <applyto>/apps/gswitchit/Applet/defaultGroup</applyto>
-+ <owner>gswitchit</owner>
-+ <type>int</type>
-+ <default>-1</default>
-+ <locale name="C">
-+ <short>Default group, assigned on window creation</short>
-+ <long>Default group, assigned on window creation</long>
-+ </locale>
-+ </schema>
-+
-+ </schemalist>
-+</gconfschemafile>