Mercurial Mercurial > upstream > oracle > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-06-17 Damien Carbery <[email protected]>
authordcarbery
Tue, 17 Jun 2008 11:00:56 +0000
changeset 12678 a0381d961be6
parent 12677 95b2d35809f1
child 12679 6e73d99e4df4
2008-06-17 Damien Carbery <[email protected]> * base-specs/gnome-themes.spec, base-specs/gucharmap.spec, base-specs/mousetweaks.spec: Bump to 2.23.4. * base-specs/gtkhtml.spec: Bump to 3.23.4. * patches/gucharmap-01-menu-entry.diff: Rework. * base-specs/evolution-exchange.spec: Bump to 2.23.4. Remove upstream patch, 01-libebackend. * patches/evolution-exchange-01-libebackend.diff: Removed, upstream.
ChangeLog file | annotate | diff | comparison | revisions
base-specs/evolution-exchange.spec file | annotate | diff | comparison | revisions
base-specs/gnome-themes.spec file | annotate | diff | comparison | revisions
base-specs/gtkhtml.spec file | annotate | diff | comparison | revisions
base-specs/gucharmap.spec file | annotate | diff | comparison | revisions
base-specs/mousetweaks.spec file | annotate | diff | comparison | revisions
patches/evolution-exchange-01-libebackend.diff file | annotate | diff | comparison | revisions
patches/gucharmap-01-menu-entry.diff file | annotate | diff | comparison | revisions
patches/libgnomeui-02-gio-critical.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Tue Jun 17 10:24:56 2008 +0000
+++ b/ChangeLog	Tue Jun 17 11:00:56 2008 +0000
@@ -1,10 +1,19 @@
+2008-06-17  Damien Carbery <[email protected]>
+
+	* base-specs/gnome-themes.spec, base-specs/gucharmap.spec,
+	  base-specs/mousetweaks.spec: Bump to 2.23.4.
+	* base-specs/gtkhtml.spec: Bump to 3.23.4.
+	* patches/gucharmap-01-menu-entry.diff: Rework.
+	* base-specs/evolution-exchange.spec: Bump to 2.23.4. Remove upstream
+	  patch, 01-libebackend.
+	* patches/evolution-exchange-01-libebackend.diff: Removed, upstream.
+
 2008-06-17  Damien Carbery <[email protected]>
 
 	* base-specs/libgnome.spec, base-specs/libbonoboui.spec: Bump to 2.23.4.
 	* base-specs/libbonobo.spec: Bump to 2.23.0.
-	* base-specs/libgnomeui.spec: Bump to 2.23.4. Comment out failing
-	  patch, libgnomeui-02-gio-critical.diff. Filed bugzilla 2258 to request
-	  engineering assistance.
+	* base-specs/libgnomeui.spec: Bump to 2.23.4. Remove obsolete patch,
+	  02-gio-critical.
 
 2008-06-17  Jeff Cai<[email protected]>
 
--- a/base-specs/evolution-exchange.spec	Tue Jun 17 10:24:56 2008 +0000
+++ b/base-specs/evolution-exchange.spec	Tue Jun 17 11:00:56 2008 +0000
@@ -10,14 +10,12 @@
 Name:         evolution-exchange
 License:      GPL
 Group:        System/Libraries/GNOME
-Version:      2.23.3
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Evolution connector for Microsoft Exchange
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
-# date:2008-06-03 bugzilla:536376 owner:jedy type:bug
-Patch1:       evolution-exchange-01-libebackend.diff
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -60,7 +58,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -117,6 +114,8 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4. Remove upstream patch, 01-libebackend.
 * Wed Jun 03 2008 - [email protected]
 - Bump to 2.23.3 and add 01-libebackend.diff.
 * Wed May 28 2008 - [email protected]
--- a/base-specs/gnome-themes.spec	Tue Jun 17 10:24:56 2008 +0000
+++ b/base-specs/gnome-themes.spec	Tue Jun 17 11:00:56 2008 +0000
@@ -11,7 +11,7 @@
 License:		GPL
 Group:			System/GUI/GNOME
 # icon-naming-utils should be bumped at the same time - it's a dependency.
-Version:		2.23.3
+Version:		2.23.4
 Release:		3
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -97,6 +97,9 @@
 %{_datadir}/locale/*/LC_MESSAGES/*.mo
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
+
 * Tue Jun 03 2008 - [email protected]
 - Bump to 2.23.3.
 
--- a/base-specs/gtkhtml.spec	Tue Jun 17 10:24:56 2008 +0000
+++ b/base-specs/gtkhtml.spec	Tue Jun 17 11:00:56 2008 +0000
@@ -12,7 +12,7 @@
 Group:        System/Libraries/GNOME
 # major_version is generally a 'stable' build number i.e. has an even number.
 %define major_version 3.14
-Version:      3.23.3
+Version:      3.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -115,6 +115,9 @@
 %{_includedir}/libgtkhtml-%{major_version}/*
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 3.23.4.
+
 * Tue Jun 03 2008 - [email protected]
 - Bump to 3.23.3.
 
--- a/base-specs/gucharmap.spec	Tue Jun 17 10:24:56 2008 +0000
+++ b/base-specs/gucharmap.spec	Tue Jun 17 11:00:56 2008 +0000
@@ -11,12 +11,12 @@
 Name:         gucharmap
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.22.0
+Version:      2.23.4
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      GNOME Unicode Character Map
-Source:       http://ftp.gnome.org/pub/GNOME/sources/gucharmap/2.22/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/gucharmap/2.23/%{name}-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 # date:2006-06-06 owner:gman type:branding
 Patch1:       gucharmap-01-menu-entry.diff
@@ -112,6 +112,9 @@
 %{_datadir}/gnome/help/*
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
+
 * Tue Mar 11 2008 - [email protected]
 - Call aclocal to get patched intltool.m4.
 
--- a/base-specs/mousetweaks.spec	Tue Jun 17 10:24:56 2008 +0000
+++ b/base-specs/mousetweaks.spec	Tue Jun 17 11:00:56 2008 +0000
@@ -12,7 +12,7 @@
 Name:           mousetweaks
 License:        GPL
 Group:          System/Library
-Version:        2.23.3
+Version:        2.23.4
 Release:        1
 Summary:        A program that provides mouse accessibility enhancements.
 URL:            https://launchpad.net/mousetweaks
@@ -91,7 +91,12 @@
 %{_sysconfdir}/gconf/schemas/mousetweaks.schemas
 %{_sysconfdir}/gconf/schemas/pointer-capture-applet.schemas
 
+
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
+* Tue Jun 03 2008 - [email protected]
+- Bump to 2.23.3.
 * Tue Jun 03 2008 - [email protected]
 - Bump to 2.23.3.
 * Wed May 28 2008 - [email protected]
--- a/patches/evolution-exchange-01-libebackend.diff	Tue Jun 17 10:24:56 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -r -u evolution-exchange-2.23.3/configure.in evolution-exchange-2.23.3-new/configure.in
---- evolution-exchange-2.23.3/configure.in	2008-05-30 15:23:54.000000000 +0800
-+++ evolution-exchange-2.23.3-new/configure.in	2008-06-03 13:23:17.170147000 +0800
-@@ -193,7 +193,7 @@
- AC_SUBST(EXCHANGE_STORAGE_CFLAGS)
- AC_SUBST(EXCHANGE_STORAGE_LIBS)
- 
--PKG_CHECK_MODULES(LIBEXCHANGE, libsoup-2.4 evolution-shell libedataserverui-$EDS_API_VERSION libexchange-storage-$EDS_API_VERSION)
-+PKG_CHECK_MODULES(LIBEXCHANGE, libsoup-2.4 evolution-shell libedataserverui-$EDS_API_VERSION libebackend-$EDS_API_VERSION libexchange-storage-$EDS_API_VERSION)
- AC_SUBST(LIBEXCHANGE_CFLAGS)
- AC_SUBST(LIBEXCHANGE_LIBS)
- 
--- a/patches/gucharmap-01-menu-entry.diff	Tue Jun 17 10:24:56 2008 +0000
+++ b/patches/gucharmap-01-menu-entry.diff	Tue Jun 17 11:00:56 2008 +0000
@@ -1,5 +1,5 @@
---- gucharmap-2.21.90/gucharmap.desktop.in.orig	2008-01-30 17:30:34.660557542 +0000
-+++ gucharmap-2.21.90/gucharmap.desktop.in	2008-01-30 17:31:01.147832408 +0000
+--- gucharmap-2.23.4/gucharmap.desktop.in.in.orig	2008-06-17 11:48:38.654860878 +0100
++++ gucharmap-2.23.4/gucharmap.desktop.in.in	2008-06-17 11:49:15.136111270 +0100
 @@ -1,7 +1,8 @@
  [Desktop Entry]
  Encoding=UTF-8
@@ -8,5 +8,5 @@
 +# SUN_BRANDING
 +_Comment=Insert special symbols or characters into documents
  Exec=gucharmap
- Icon=gucharmap
+ Icon=accessories-character-map
  Terminal=false
--- a/patches/libgnomeui-02-gio-critical.diff	Tue Jun 17 10:24:56 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- libgnomeui-2.22.1/file-chooser/gtkfilesystemgio.c.orig	2008-03-18 09:38:00.743696000 +0100
-+++ libgnomeui-2.22.1/file-chooser/gtkfilesystemgio.c	2008-03-18 09:38:31.182565000 +0100
-@@ -1621,7 +1621,7 @@
- 				NULL, FALSE, 0, NULL,
- 				NULL, &error))
-     {
--      g_critical (error->message);
-+      g_warning (error->message);
-       g_error_free (error);
-     }
-
upstream/oracle/spec-files