rpms/krb5-auth-dialog/F-12 seriesid-clash.patch, NONE, 1.1 krb5-auth-dialog.spec, 1.41, 1.42

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17623

Modified Files:
	krb5-auth-dialog.spec 
Added Files:
	seriesid-clash.patch 
Log Message:
Fix a help file seriesid clash


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

--- NEW FILE seriesid-clash.patch ---
diff -up krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in.seriesid krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in
--- krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in.seriesid	2009-10-27 00:10:28.927799943 -0400
+++ krb5-auth-dialog-0.13/help/krb5-auth-dialog.omf.in	2009-10-27 00:12:23.014549879 -0400
@@ -30,7 +30,7 @@
     <description>
       User manual for the Kerberos Network Authentication Dialog
     </description>
-    <relation seriesid="62118a88-a670-11d9-9d16-8c554140c753"/>
+    <relation seriesid="08f1353f-49ce-d542-22ba-383c4275714f00"/>
     <language code="C"/>
     <rights type="GNU FDL" license.version="1.1" holder="Guido Günther"/>
   </resource>


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-12/krb5-auth-dialog.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- krb5-auth-dialog.spec	21 Oct 2009 07:00:20 -0000	1.41
+++ krb5-auth-dialog.spec	27 Oct 2009 04:16:08 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -28,12 +28,16 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=599725
+Patch0: seriesid-clash.patch
+
 %description
 This package contains a dialog that warns the user when their Kerberos
 tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
+%patch0 -p1 -b .seriesid
 
 %build
 %configure
@@ -82,6 +86,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Tue Oct 27 2009 Matthias Clasen <mclasen at redhat.com> - 0.13-2
+- Fix a clash with the help file seriesid
+
 * Wed Oct 21 2009 Matěj Cepl <mcepl at redhat.com> - 0.13-1
 - New upstream release (fixes #530001)