Ignore:
Timestamp:
Apr 16, 2011, 7:59:42 PM (11 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
 
Location:
branches/fc15-dev/server/fedora
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/fedora/Makefile

    r1804 r1807  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh 389-ds-base
     21upstream_yum    = krb5 krb5.i686 httpd openssh
    2222hackage         = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
    2323upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
     
    4545heartbeat_url   = "http://kojipkgs.fedoraproject.org/packages/heartbeat/3.0.0/0.5.0daab7da36a8.hg.fc12/src/heartbeat-3.0.0-0.5.0daab7da36a8.hg.fc12.src.rpm"
    4646pacemaker_url   = "http://kojipkgs.fedoraproject.org/packages/pacemaker/1.0.5/5.fc12/src/pacemaker-1.0.5-5.fc12.src.rpm"
    47 zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.tar.gz"
     47zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
    4848
    4949PKG             = $(patsubst %.i686,%,$@)
  • branches/fc15-dev/server/fedora/specs/httpd.spec.patch

    r1738 r1807  
    11--- httpd.spec.orig     2010-10-27 08:26:15.000000000 -0400
    22+++ httpd.spec  2010-11-18 18:20:43.000000000 -0500
    3 @@ -7,7 +7,7 @@
     3@@ -8,7 +8,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    66 Version: 2.2.17
    7 -Release: 1%{?dist}.1
    8 +Release: 1%{?dist}.1.scripts.%{scriptsversion}
     7-Release: 10%{?dist}.1
     8+Release: 10%{?dist}.1.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -55,6 +55,14 @@
    13  Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
     12@@ -54,6 +54,14 @@
     13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
    1515 
    1616+Provides: scripts-httpd
     
    2525 The Apache HTTP Server is a powerful, efficient, and extensible
    2626 web server.
    27 @@ -65,6 +73,7 @@
     27@@ -64,6 +72,7 @@
    2828 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2929 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3333 %description devel
    3434 The httpd-devel package contains the APXS binary and other files
    35 @@ -103,6 +112,7 @@
    36  Requires(post): openssl >= 0.9.7f-4, /bin/cat
     35@@ -102,6 +102,7 @@
     36 Requires(post): openssl, /bin/cat
    3737 Requires(pre): httpd
    38  Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     38 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
    3939+Provides: scripts-mod_ssl
    4040 Obsoletes: stronghold-mod_ssl
    4141 
    4242 %description -n mod_ssl
    43 @@ -130,6 +140,13 @@
     43@@ -129,6 +139,13 @@
    4444 # Patch in vendor/release string
    4545 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    5555 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5656 if test "x${vmmn}" != "x%{mmn}"; then
    57 @@ -177,10 +194,12 @@
     57@@ -176,10 +193,12 @@
    5858         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5959        --enable-suexec --with-suexec \
  • branches/fc15-dev/server/fedora/specs/krb5.spec.patch

    r1795 r1807  
    11--- krb5.spec.orig      2011-03-25 17:29:24.000000000 -0400
    22+++ krb5.spec   2011-03-25 17:31:15.000000000 -0400
    3 @@ -10,7 +10,7 @@
     3@@ -6,7 +6,7 @@
    44 Summary: The Kerberos network authentication system
    55 Name: krb5
    6  Version: 1.7.1
    7 -Release: 18%{?dist}
    8 +Release: 18%{?dist}.scripts.%{scriptsversion}
     6 Version: 1.9
     7-Release: 6%{?dist}
     8+Release: 6%{?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.7/krb5-1.7.1-signed.tar
     10 # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -96,6 +96,8 @@
    13  Patch107: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
    14  Patch108: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
     12@@ -53,6 +53,8 @@
     13 Patch74: http://web.mit.edu/kerberos/advisories/2011-002-patch.txt
     14 Patch75: http://web.mit.edu/kerberos/advisories/2011-003-patch.txt
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
     
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -140,6 +142,7 @@
     21@@ -97,6 +99,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 @@ -1684,6 +1687,7 @@
    30  %patch106 -p1 -b .2011-001
    31  %patch107 -p1 -b .2011-002
    32  %patch108 -p1 -b .2011-003
     29@@ -192,6 +195,7 @@
     30 %patch73 -p1 -b .2011-001
     31 %patch74 -p1 -b .2011-002
     32 %patch75 -p1 -b .2011-003
    3333+%patch1000 -p1 -b .kuserok
    3434 gzip doc/*.ps
  • branches/fc15-dev/server/fedora/specs/scripts-base.spec

    r1761 r1807  
    3131Requires: httpdmods
    3232Requires: %{all_archs nss_nonlocal}
    33 Requires: scripts-389-ds
    3433%define debug_package %{nil}
    3534
  • branches/fc15-dev/server/fedora/specs/zephyr.spec

    r1693 r1807  
    11Name:           zephyr
    2 Version:        3.0
     2Version:        3.0.1
    33Release:        0.%{scriptsversion}%{?dist}
    44Summary:        Client programs for the Zephyr real-time messaging system
     
    139139
    140140%changelog
     141* Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> 3.0.1-0
     142- Zephyr 3.0.1
     143
    141144* Sun Sep 19 2010 Anders Kaseorg <andersk@mit.edu> - 3.0-0
    142145- Decrease version below a hypothetical Fedora package.
Note: See TracChangeset for help on using the changeset viewer.