Changeset 1360 for trunk/server

Timestamp:

Nov 20, 2009, 3:00:21 AM (14 years ago)

Author:

mitchb

Message:

Stop scriptsifying php; our patch for the-bug is r281116 in 5.2.11 upstream

Location:

trunk/server

Files:

• common/patches/php-scripts-304.patch (deleted)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/php.spec.patch (deleted)
• fedora/specs/scripts-base.spec (modified) (1 diff)

trunk/server/fedora/Makefile

@@ -19 +19 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum    = krb5 krb5.i586 httpd openssh php
+upstream_yum    = krb5 krb5.i586 httpd openssh
 upstream        = openafs $(upstream_yum)
 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-base

trunk/server/fedora/specs/scripts-base.spec

@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-php, php_scripts
+Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, php_scripts
 %define debug_package %{nil}