rpms/gnome-panel/FC-5 gnome-panel.spec, 1.120, 1.121 sources, 1.41, 1.42

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15167

Modified Files:
	gnome-panel.spec sources 
Log Message:
2.14.2



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/gnome-panel.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-panel.spec	10 Apr 2006 18:14:02 -0000	1.120
+++ gnome-panel.spec	30 May 2006 03:10:05 -0000	1.121
@@ -19,8 +19,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.14.1
-Release: 1.fc5.1
+Version: 2.14.2
+Release: 1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -72,8 +72,6 @@
 Patch6: gnome-panel-2.13.5-switch-user.patch
 Patch7: gnome-panel-2.14.0-gpm-integration.patch
 Patch8: gnome-panel-2.13.90-use-beagle.patch
-Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
-Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 
 Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
 
@@ -103,8 +101,6 @@
 %patch6 -p1 -b .switch-user
 %patch7 -p1 -b .gpm-integration
 %patch8 -p1 -b .use-beagle
-%patch9 -p1 -b .ignore-unknown-options
-%patch10 -p1 -b .remove-duplicate-entry
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -221,6 +217,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
+- Update to 2.14.2
+- Drop upstreamed patches
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1.fc5.1
 - Update to 2.14.1
 - Update patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/FC-5/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	10 Apr 2006 17:54:59 -0000	1.41
+++ sources	30 May 2006 03:10:05 -0000	1.42
@@ -1 +1 @@
-1f5bc59c7c49cf90a797d892ab3ea05f  gnome-panel-2.14.1.tar.bz2
+7db1afb3f6cbca12acecc49c68b4a655  gnome-panel-2.14.2.tar.bz2