Mercurial Mercurial > sustaining > oi_151a > 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.
2009-09-22 Jeff Cai <[email protected]>
authorqc161282
Tue, 22 Sep 2009 04:23:39 +0000
changeset 16607 6e8911ea08c9
parent 16606 8938520ae32c
child 16608 f115413fa2d1
2009-09-22 Jeff Cai <[email protected]> * base-specs/evolution-data-server.spec: Bump to 2.28.0 * base-specs/evolution.spec: Bump to 2.28.0 * base-specs/gnome-keyring.spec: Bump to 2.28.0 * base-specs/gtkhtml.spec: Bump to 3.28.0 * base-specs/seahorse.spec: Bump to 2.28.0 * patches/seahorse-06-return-void.diff: Upstreamed
ChangeLog file | annotate | diff | comparison | revisions
base-specs/evolution-data-server.spec file | annotate | diff | comparison | revisions
base-specs/evolution.spec file | annotate | diff | comparison | revisions
base-specs/gnome-keyring.spec file | annotate | diff | comparison | revisions
base-specs/gtkhtml.spec file | annotate | diff | comparison | revisions
base-specs/seahorse.spec file | annotate | diff | comparison | revisions
patches/seahorse-06-return-void.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Tue Sep 22 03:16:50 2009 +0000
+++ b/ChangeLog	Tue Sep 22 04:23:39 2009 +0000
@@ -1,3 +1,12 @@
+2009-09-22  Jeff Cai <[email protected]>
+
+	* base-specs/evolution-data-server.spec: Bump to 2.28.0
+	* base-specs/evolution.spec: Bump to 2.28.0
+	* base-specs/gnome-keyring.spec: Bump to 2.28.0
+	* base-specs/gtkhtml.spec: Bump to 3.28.0
+	* base-specs/seahorse.spec: Bump to 2.28.0
+	* patches/seahorse-06-return-void.diff: Upstreamed
+
 2009-09-22  Halton Huo  <[email protected]>
 
 	* base-specs/vinagre.spec: Bump to 2.28.0.1
--- a/base-specs/evolution-data-server.spec	Tue Sep 22 03:16:50 2009 +0000
+++ b/base-specs/evolution-data-server.spec	Tue Sep 22 04:23:39 2009 +0000
@@ -12,12 +12,12 @@
 Name:         evolution-data-server
 License:      LGPL v2
 Group:        System/Libraries/GNOME
-Version:      2.27.92
+Version:      2.28.0
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Backend Library for Evolution
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:      l10n-configure.sh
 %if %build_l10n
@@ -193,6 +193,8 @@
 %{_datadir}/idl/*
 
 %changelog
+* Tue Sep 22 2009 - [email protected]
+- Bump to 2.28.0
 * Wed Sep 09 2009 - [email protected]
 - Bump to 2.27.92
 * Mon Aug 24 2009 - [email protected]
--- a/base-specs/evolution.spec	Tue Sep 22 03:16:50 2009 +0000
+++ b/base-specs/evolution.spec	Tue Sep 22 04:23:39 2009 +0000
@@ -16,12 +16,12 @@
 Group:        System/GUI/GNOME
 # major_version is generally a 'stable' build number i.e. has an even number.
 %define major_version 2.28
-Version:      2.27.92
+Version:      2.28.0
 Release:      1
 Distribution: java-desktop-system
 Vendor:       Sun Microsystems, Inc.
 Summary:      Evolution
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 Source2:      l10n-configure.sh
@@ -265,6 +265,8 @@
 %{_datadir}/gnome-pilot/*
 
 %changelog
+* Tue Sep 22 2009 - [email protected]
+- Bump to 2.28.0
 * Wed Sep 09 2009 - [email protected]
 - Bump to 2.27.92
 * Wed Aug 24 2009 - [email protected]
--- a/base-specs/gnome-keyring.spec	Tue Sep 22 03:16:50 2009 +0000
+++ b/base-specs/gnome-keyring.spec	Tue Sep 22 04:23:39 2009 +0000
@@ -13,13 +13,13 @@
 Name:         gnome-keyring
 License:      GPL v2, LGPL v2
 Group:        System/GUI/GNOME
-Version:      2.27.92
+Version:      2.28.0
 Release:      4
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 URL:          http://www.gnome.org
 Summary:      GNOME Key Ring
-Source:       http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source:       http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:      l10n-configure.sh
 %endif
@@ -143,6 +143,8 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Sep 22 2009 - [email protected]
+- Bump to 2.28.0
 * Sep 14 2009 - [email protected]
 - Bump to 2.27.92
 - Upstream path -03-timer-shutdown
--- a/base-specs/gtkhtml.spec	Tue Sep 22 03:16:50 2009 +0000
+++ b/base-specs/gtkhtml.spec	Tue Sep 22 04:23:39 2009 +0000
@@ -16,12 +16,12 @@
 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.27.92
+Version:      3.28.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Library for HTML support in Evolution
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.27/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.28/%{name}-%{version}.tar.bz2
 Source1:      l10n-configure.sh
 
 URL:          http://www.gnome.org
@@ -113,6 +113,8 @@
 %{_includedir}/libgtkhtml-%{major_version}/*
 
 %changelog
+* Tue Sep 22 2009 - [email protected]
+- Bump to 3.28.0
 * Wed Sep 09 2009 - [email protected]
 - Bump to 3.27.92.
 * Mon Aug 24 2009 - [email protected]
--- a/base-specs/seahorse.spec	Tue Sep 22 03:16:50 2009 +0000
+++ b/base-specs/seahorse.spec	Tue Sep 22 04:23:39 2009 +0000
@@ -13,12 +13,12 @@
 Name:         seahorse
 License:      GPL v2, LGPL v2, FDL v1.1
 Group:        System/GUI/GNOME
-Version:      2.27.92
+Version:      2.28.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 Summary:      Seahorse
-Source:       http://download.gnome.org/sources/%{name}/2.27/%{name}-%{version}.tar.bz2
+Source:       http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -27,8 +27,6 @@
 Patch2:		seahorse-02-disable-remote.diff
 # date:2008-11-04 bugzilla:556670 owner:jefftsai type:bug
 Patch3:		seahorse-03-import-ssh.diff
-# date:2008-12-29 owner:jefftsai type:branding
-Patch6:		seahorse-06-return-void.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -53,7 +51,6 @@
 %setup -q
 %patch2 -p1
 %patch3 -p1
-%patch6 -p1
 
 %build
 %ifos linux
@@ -100,6 +97,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Sep 22 2009 - [email protected]
+- Bump to 2.28.0
+- Upstream patch -06-return-void
 * Mon Sep 14 2009 - [email protected]
 - Bump to 2.27.92
 * Tue Aug 11 2009 - [email protected]
--- a/patches/seahorse-06-return-void.diff	Tue Sep 22 03:16:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Index: seahorse/libseahorse/seahorse-view.c
-===================================================================
---- seahorse/libseahorse/seahorse-view.c	(revision 2692)
-+++ seahorse/libseahorse/seahorse-view.c	(working copy)
-@@ -80,7 +80,7 @@
-                                  SeahorseCommands *commands)
- {
- 	g_return_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->register_commands);
--	return SEAHORSE_VIEW_GET_INTERFACE (self)->register_commands (self, pred, commands);
-+	SEAHORSE_VIEW_GET_INTERFACE (self)->register_commands (self, pred, commands);
- }
- 
- void
-@@ -88,7 +88,7 @@
-                            const gchar *ui_definition, GtkActionGroup *actions)
- {
- 	g_return_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->register_ui);
--	return SEAHORSE_VIEW_GET_INTERFACE (self)->register_ui (self, pred, ui_definition, actions);
-+	SEAHORSE_VIEW_GET_INTERFACE (self)->register_ui (self, pred, ui_definition, actions);
- }
- 
- static void
sustaining/oi_151a/spec-files