rpms/gnome-applets/F-12 seriesid-clash.patch, NONE, 1.1 gnome-applets.spec, 1.354, 1.355

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22703

Modified Files:
	gnome-applets.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
avoid help file seriesid clash


seriesid-clash.patch:
 invest-applet.omf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE seriesid-clash.patch ---
diff -up gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in
--- gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in.seriesid	2009-10-27 00:25:35.351806142 -0400
+++ gnome-applets-2.28.0/invest-applet/docs/invest-applet.omf.in	2009-10-27 00:29:15.578549690 -0400
@@ -3,7 +3,7 @@
   <resource>
     <subject category="GNOME|Applets|Utility"/>
     <type>user's guide</type>
-    <relation seriesid="df109296-40e7-11d6-935f-beaae1cfe4f9"/>
+    <relation seriesid="04cc2ede-586b-2643-7e6f-37a004e0fbd470"/>
     <rights type="GNU FDL" license.version="1.1" holder="Terence Hall"/>
   </resource>        
 </omf>


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/F-12/gnome-applets.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -p -r1.354 -r1.355
--- gnome-applets.spec	22 Sep 2009 03:28:49 -0000	1.354
+++ gnome-applets.spec	27 Oct 2009 04:36:14 -0000	1.355
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.28.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -61,6 +61,9 @@ Patch41:	gnome-applets-no-mixer-icon.pat
 # do the nullapplet dance for stickynotes
 Patch42:	stickynotes-null.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=599728
+Patch44:	seriesid-clash.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -150,6 +153,7 @@ tar xjf %{SOURCE2}
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 %patch35 -p1 -b .modemlights-libgnome
+%patch44 -p1 -b .seriesid
 
 autoreconf -i -f
 
@@ -342,6 +346,9 @@ fi
 
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-2
+- Fix a help file seriesid clash between accessx-status and invest-applet
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.0-1
 - Update to 2.28.0