2010-04-12 Christian Kelly <[email protected]>
authorchrisk
Mon, 12 Apr 2010 14:56:15 +0000
changeset 17824 5d68466ecd24
parent 17823 ce31c8e7155f
child 17825 378d567d5992
2010-04-12 Christian Kelly <[email protected]> * base-specs/libgnomeui.spec: Bump to 2.24.3. * base-specs/libbonoboui.spec: Bump to 2.24.3. * patches/libbonoboui-02-acce.diff: Remove, upstream.
ChangeLog
base-specs/libbonoboui.spec
base-specs/libgnomeui.spec
patches/libbonoboui-02-acce.diff
patches/libbonoboui-02-module-sections.diff
patches/libbonoboui-03-module-sections.diff
--- a/ChangeLog	Mon Apr 12 14:32:44 2010 +0000
+++ b/ChangeLog	Mon Apr 12 14:56:15 2010 +0000
@@ -1,3 +1,9 @@
+2010-04-12  Christian Kelly  <[email protected]>
+
+	* base-specs/libgnomeui.spec: Bump to 2.24.3.
+	* base-specs/libbonoboui.spec: Bump to 2.24.3.
+	* patches/libbonoboui-02-acce.diff: Remove, upstream.
+
 2010-04-12  Christian Kelly  <[email protected]>
 
 	* base-specs/gtkmm.spec: Bump to 2.20.1.
--- a/base-specs/libbonoboui.spec	Mon Apr 12 14:32:44 2010 +0000
+++ b/base-specs/libbonoboui.spec	Mon Apr 12 14:56:15 2010 +0000
@@ -13,7 +13,7 @@
 Name:         libbonoboui 
 License:      LGPL
 Group:        System/Libraries/GNOME 
-Version:      2.24.2
+Version:      2.24.3
 Release:      2
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -68,7 +68,6 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %ifos linux
@@ -136,6 +135,8 @@
 %{_mandir}/man3/*.gz
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.24.3.
 * Thu Oct 15 2009 - [email protected]
 - Add patch -02-acce to fix #598362
   Solve the dead loop in language de_DE.UTF-8
--- a/base-specs/libgnomeui.spec	Mon Apr 12 14:32:44 2010 +0000
+++ b/base-specs/libgnomeui.spec	Mon Apr 12 14:56:15 2010 +0000
@@ -13,7 +13,7 @@
 Name:         libgnomeui 
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.24.2
+Version:      2.24.3
 Release:      3
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -137,6 +137,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 12 2010 - [email protected]
+- Bump to 2.24.3.
 * Wed Sep 23 2009 - [email protected]
 - Bump to 2.24.2
 * Fri Mar 13 2009 - [email protected]
--- a/patches/libbonoboui-02-acce.diff	Mon Apr 12 14:32:44 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- libbonoboui-2.24.2/bonobo/bonobo-ui-util.c.orig	Mi. Okt 14 12:47:25 2009
-+++ libbonoboui-2.24.2/bonobo/bonobo-ui-util.c	Do. Okt 15 11:21:07 2009
-@@ -1261,6 +1261,10 @@
- 				gchar last_ch;
- 	      
- 				last_ch = *accelerator;
-+				if (!last_ch || last_ch == DELIM_POST) {
-+					g_warning ("Unknown accelerator - '%s'", accelerator);
-+					return;
-+				}
- 				while (last_ch && last_ch != DELIM_POST)
- 				{
- 					last_ch = *accelerator;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libbonoboui-02-module-sections.diff	Mon Apr 12 14:56:15 2010 +0000
@@ -0,0 +1,11 @@
+--- libbonoboui-2.24.2.orig/doc/api/Makefile.am	2010-01-04 20:29:46.838611420 +0000
++++ libbonoboui-2.24.2/doc/api/Makefile.am	2010-01-04 20:31:16.596168160 +0000
+@@ -23,7 +23,7 @@
+ MKDB_OPTIONS=--sgml-mode --output-format=xml
+ 
+ # Extra options to supply to gtkdoc-fixref.
+-FIXXREF_OPTIONS=
++FIXXREF_OPTIONS=--module=$(DOC_MODULE)
+ 
+ # Used for dependencies.
+ HFILE_GLOB=
--- a/patches/libbonoboui-03-module-sections.diff	Mon Apr 12 14:32:44 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -ruN libbonoboui-2.24.2.orig/doc/api/Makefile.in libbonoboui-2.24.2/doc/api/Makefile.in
---- libbonoboui-2.24.2.orig/doc/api/Makefile.in	2010-01-04 16:10:24.338180207 +0000
-+++ libbonoboui-2.24.2/doc/api/Makefile.in	2010-01-04 16:12:05.945992686 +0000
-@@ -729,7 +729,7 @@
- 	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- 	@echo 'gtk-doc: Fixing cross-references'
--	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-+	cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- 	touch html-build.stamp
- 
- ##############
---- libbonoboui-2.24.2.orig/doc/api/Makefile.am	2010-01-04 20:29:46.838611420 +0000
-+++ libbonoboui-2.24.2/doc/api/Makefile.am	2010-01-04 20:31:16.596168160 +0000
-@@ -23,7 +23,7 @@
- MKDB_OPTIONS=--sgml-mode --output-format=xml
- 
- # Extra options to supply to gtkdoc-fixref.
--FIXXREF_OPTIONS=
-+FIXXREF_OPTIONS=--module=$(DOC_MODULE)
- 
- # Used for dependencies.
- HFILE_GLOB=