rpms/evince/F-12 seriesid-clash.patch, NONE, 1.1 evince.spec, 1.172, 1.173

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/evince/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19262

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


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

--- NEW FILE seriesid-clash.patch ---
diff -up evince-2.28.1/help/evince.omf.in.seriesid evince-2.28.1/help/evince.omf.in
--- evince-2.28.1/help/evince.omf.in.seriesid	2009-10-27 00:16:07.428826007 -0400
+++ evince-2.28.1/help/evince.omf.in	2009-10-27 00:16:23.490799799 -0400
@@ -5,7 +5,7 @@
     <type>
       user's guide
     </type>
-    <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/>
+    <relation seriesid="0e6be85e-fbb1-6c10-d9c6-d0bc37d6a749e0"/>
     <rights type="GNU FDL" license.version="1.1" holder="Nickolay V. Shmyrev"/>
   </resource>
 </omf>


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/F-12/evince.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- evince.spec	22 Oct 2009 13:53:30 -0000	1.172
+++ evince.spec	27 Oct 2009 04:21:54 -0000	1.173
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.28.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -20,6 +20,8 @@ Patch0:		evince-pdf-print-revert.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596888
 Patch1:         0001-Provide-some-indication-that-search-is-not-available.patch
 Patch2:		evince-thumbnail-allocation.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599726
+Patch3:		seriesid-clash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +114,7 @@ This package contains a backend to let e
 # %patch1 -p0 -b .duplex-copies
 %patch1 -p1 -b .search-not-available
 %patch2 -p0 -b .thumbnail-allocation
+%patch3 -p1 -b .seriesid
 
 %build
 %configure --disable-static --disable-scrollkeeper \
@@ -266,6 +269,9 @@ fi
 %{_libdir}/evince/1/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-4
+- Avoid a help file seriesid clash
+
 * Thu Oct 22 2009 Marek Kasik <mkasik at redhat.com> - 2.28.1-3
 - Add evince-thumbnail-allocation.patch (checks whether
 - GdkPixbuf was allocated correctly)