rpms/gnome-device-manager/F-12 seriesid-clash.patch, NONE, 1.1 gnome-device-manager.spec, 1.5, 1.6

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-device-manager.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
Avoid a help file seriesid clash


seriesid-clash.patch:
 gnome-device-manager.omf.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE seriesid-clash.patch ---
diff -up gnome-device-manager-0.2/help/gnome-device-manager.omf.in.seriesid gnome-device-manager-0.2/help/gnome-device-manager.omf.in
--- gnome-device-manager-0.2/help/gnome-device-manager.omf.in.seriesid	2009-10-27 00:37:02.404548927 -0400
+++ gnome-device-manager-0.2/help/gnome-device-manager.omf.in	2009-10-27 00:37:20.258550452 -0400
@@ -30,7 +30,7 @@
     <description>
       User manual for GNOME Device Manager
     </description>
-    <relation seriesid="01234567-a670-11d9-9d16-8c554140c753"/>
+    <relation seriesid="0a57db21-f503-82a0-2ebf-0f22a3d8350db0"/>
     <language code="C"/>
     <rights type="GNU FDL" license.version="1.1" holder="David Zeuthen"/>
   </resource>


Index: gnome-device-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-device-manager/F-12/gnome-device-manager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gnome-device-manager.spec	25 Jul 2009 00:37:13 -0000	1.5
+++ gnome-device-manager.spec	27 Oct 2009 04:41:21 -0000	1.6
@@ -9,12 +9,13 @@
 Summary: Graphical Device Manager Application
 Name: gnome-device-manager
 Version: 0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 Patch0: note-theming.patch
+Patch1: seriesid-clash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils
@@ -69,6 +70,7 @@ Development files for gnome-device-manag
 %prep
 %setup -q
 %patch0 -p1 -b .note-theming
+%patch1 -p1 -b .seriesid
 
 %build
 %configure
@@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> 0.2-6
+- Avoid a help file seriesid clash
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild