Index: /branches/fc17-dev/server/fedora/specs/krb5.spec.patch
===================================================================
--- /branches/fc17-dev/server/fedora/specs/krb5.spec.patch	(revision 2230)
+++ /branches/fc17-dev/server/fedora/specs/krb5.spec.patch	(revision 2231)
@@ -1,16 +1,16 @@
---- krb5.spec.~1~	2012-03-20 18:26:31.000000000 -0400
-+++ krb5.spec	2012-05-25 15:32:55.944676262 -0400
-@@ -15,7 +15,7 @@
+--- krb5.spec.orig	2012-06-17 19:29:24.140005717 -0400
++++ krb5.spec	2012-06-17 19:30:47.834405053 -0400
+@@ -20,7 +20,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.10
--Release: 6%{?dist}
-+Release: 6%{?dist}.scripts.%{scriptsversion}
+ Version: 1.10.2
+-Release: 2%{?dist}
++Release: 2%{?dist}.scripts.%{scriptsversion}
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -66,6 +66,8 @@
- Patch106: krb5-1.10-lookaside.patch
- Patch107: krb5-1.10-string-rpc-acl-fix.patch
+@@ -69,6 +69,8 @@
+ Patch105: krb5-kvno-230379.patch
+ Patch106: krb5-1.10.2-keytab-etype.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19,5 +19,5 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -119,6 +121,7 @@
+@@ -126,6 +128,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
@@ -27,8 +27,8 @@
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -238,6 +241,7 @@
+@@ -245,6 +248,7 @@
+ %patch103 -p0 -b .gcc47
  %patch105 -p1 -b .kvno
- %patch106 -p1 -b .7082
- %patch107 -p1 -b .7093
+ %patch106 -p1 -b .keytab-etype
 +%patch1000 -p1 -b .kuserok
  rm src/lib/krb5/krb/deltat.c