Changeset 2246 for trunk/server/fedora/specs/krb5.spec.patch

Timestamp:

Jun 27, 2012, 10:29:47 PM (12 years ago)

Author:

ezyang

Message:

Reintegrate Fedora 17 development branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/specs/krb5.spec.patch (modified) (3 diffs)

trunk/server/fedora/specs/krb5.spec.patch

@@ -1 @@
---- krb5.spec.~1~       2012-03-08 16:20:41.000000000 -0500
-+++ krb5.spec   2012-04-01 22:07:14.834013302 -0400
-@@ -6,7 +6,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.9.3
--Release: 1%{?dist}
-+Release: 1%{?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.9/krb5-1.9.3-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -64,6 +64,8 @@
- Patch102: krb5-1.9-7048.patch
- Patch103: krb5-kvno-230379.patch
+@@ -69,6 +69,8 @@
+ Patch105: krb5-kvno-230379.patch
+ Patch106: krb5-1.10.2-keytab-etype.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19 +19 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -113,6 +115,7 @@
+@@ -126,6 +128,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
@@ -27 +27 @@
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -219,6 +222,7 @@
- %patch101 -p1 -b .7047
- %patch102 -p1 -b .7048
- %patch103 -p1 -b .kvno
+@@ -245,6 +248,7 @@
+ %patch103 -p0 -b .gcc47
+ %patch105 -p1 -b .kvno
+ %patch106 -p1 -b .keytab-etype
 +%patch1000 -p1 -b .kuserok
+ rm src/lib/krb5/krb/deltat.c
+ 
  gzip doc/*.ps
- 
- sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex