Ignore:
Timestamp:
Jun 27, 2012, 10:29:47 PM (10 years ago)
Author:
ezyang
Message:
Reintegrate Fedora 17 development branch into trunk.
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r2187 r2246  
    1 --- krb5.spec.~1~       2012-03-08 16:20:41.000000000 -0500
    2 +++ krb5.spec   2012-04-01 22:07:14.834013302 -0400
    3 @@ -6,7 +6,7 @@
     1--- krb5.spec.orig      2012-06-17 19:29:24.140005717 -0400
     2+++ krb5.spec   2012-06-17 19:30:47.834405053 -0400
     3@@ -20,7 +20,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.9.3
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.10.2
     7-Release: 2%{?dist}
     8+Release: 2%{?dist}.scripts.%{scriptsversion}
    99 # Maybe we should explode from the now-available-to-everybody tarball instead?
    10  # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -64,6 +64,8 @@
    13  Patch102: krb5-1.9-7048.patch
    14  Patch103: krb5-kvno-230379.patch
     12@@ -69,6 +69,8 @@
     13 Patch105: krb5-kvno-230379.patch
     14 Patch106: krb5-1.10.2-keytab-etype.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -113,6 +115,7 @@
     21@@ -126,6 +128,7 @@
    2222 %package libs
    2323 Summary: The shared libraries used by Kerberos 5
     
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -219,6 +222,7 @@
    30  %patch101 -p1 -b .7047
    31  %patch102 -p1 -b .7048
    32  %patch103 -p1 -b .kvno
     29@@ -245,6 +248,7 @@
     30 %patch103 -p0 -b .gcc47
     31 %patch105 -p1 -b .kvno
     32 %patch106 -p1 -b .keytab-etype
    3333+%patch1000 -p1 -b .kuserok
     34 rm src/lib/krb5/krb/deltat.c
     35 
    3436 gzip doc/*.ps
    35  
    36  sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
Note: See TracChangeset for help on using the changeset viewer.