Changeset 1807 for branches/fc15-dev/server/fedora/specs/krb5.spec.patch

Timestamp:

Apr 16, 2011, 7:59:42 PM (13 years ago)

Author:

achernya

Message:

Necessary changes to build the Scripts RPMs on Fedora 15:

 * Stop scriptsifying 389-ds-base, as it appears to have Mitch's patch
 * Update krb5.spec.patch for krb5-1.9
 * Update the krb5-kuserok-scripts.patch to work with krb5-1.9 (code
   review requested)
 * Update httpd.spec.patch to apply properly to Fedora's newly
   cleaned-up httpd.spec
 * Bump zephyr to version 3.0.1
 

File:

• branches/fc15-dev/server/fedora/specs/krb5.spec.patch (modified) (3 diffs)

branches/fc15-dev/server/fedora/specs/krb5.spec.patch

@@ -1 +1 @@
 --- krb5.spec.orig      2011-03-25 17:29:24.000000000 -0400
 +++ krb5.spec   2011-03-25 17:31:15.000000000 -0400
-@@ -10,7 +10,7 @@
+@@ -6,7 +6,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.7.1
--Release: 18%{?dist}
-+Release: 18%{?dist}.scripts.%{scriptsversion}
+ Version: 1.9
+-Release: 6%{?dist}
++Release: 6%{?dist}.scripts.%{scriptsversion}
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -96,6 +96,8 @@
- Patch107: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
- Patch108: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
+@@ -53,6 +53,8 @@
+ Patch74: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
+ Patch75: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19 +19 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -140,6 +142,7 @@
+@@ -97,6 +99,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
-@@ -1684,6 +1687,7 @@
- %patch106 -p1 -b .2011-001
- %patch107 -p1 -b .2011-002
- %patch108 -p1 -b .2011-003
+@@ -192,6 +195,7 @@
+ %patch73 -p1 -b .2011-001
+ %patch74 -p1 -b .2011-002
+ %patch75 -p1 -b .2011-003
 +%patch1000 -p1 -b .kuserok
  gzip doc/*.ps