Browse Source

cleanup packaging by renaming options to reflect reality/implementation and by removing options still no longer provided by PHP. Triggered by feedback from Christian Reiber.

Ralf S. Engelschall 21 years ago
parent
commit
bbfc26686f
1 changed files with 5 additions and 24 deletions
  1. 5 24
      php5/php5.spec

+ 5 - 24
php5/php5.spec

@@ -34,7 +34,7 @@ Class:        EVAL
 Group:        Language
 License:      PHP
 Version:      5.0.2
-Release:      20040924
+Release:      20041022
 
 #   package options
 %option       with_calendar      no
@@ -42,7 +42,6 @@ Release:      20040924
 %option       with_pgsql         no
 %option       with_gd            no
 %option       with_bdb           no
-%option       with_debug         no
 %option       with_zlib          no
 %option       with_bzip2         no
 %option       with_ssl           no
@@ -51,7 +50,6 @@ Release:      20040924
 %option       with_mm            no
 %option       with_pcre          no
 %option       with_ftp           no
-%option       with_java          no
 %option       with_oci7          no
 %option       with_oci8          no
 %option       with_freetype      no
@@ -61,7 +59,6 @@ Release:      20040924
 %option       with_xslt          no
 %option       with_dom           no
 %option       with_bc            no
-%option       with_transsid      no
 %option       with_curl          no
 %option       with_mhash         no
 %option       with_mcrypt        no
@@ -150,10 +147,6 @@ PreReq:       mm
 BuildPreReq:  pcre
 PreReq:       pcre
 %endif
-%if "%{with_java}" == "yes"
-BuildPreReq:  j2se
-PreReq:       j2se
-%endif
 %if "%{with_freetype}" == "yes"
 BuildPreReq:  freetype
 PreReq:       freetype
@@ -305,18 +298,12 @@ AutoReqProv:  no
         --with-png-dir=%{l_prefix} \
 %endif
 %if "%{with_freetype}" == "yes"
-        --enable-gd-imgstrttf \
         --enable-gd-native-ttf \
         --with-freetype-dir=%{l_prefix} \
 %endif
 %if "%{with_bdb}" == "yes"
         --with-db4=%{l_prefix} \
 %endif
-%if "%{with_debug}" == "yes"
-        --with-debug=yes \
-%else
-        --with-debug=no \
-%endif
 %if "%{with_zlib}" == "yes"
         --with-zlib=%{l_prefix} \
         --with-zlib-dir=%{l_prefix} \
@@ -335,14 +322,11 @@ AutoReqProv:  no
         --enable-session \
 %endif
 %if "%{with_pcre}" == "yes"
-        --with-pcre=%{l_prefix} \
+        --with-pcre-regex=%{l_prefix} \
 %endif
 %if "%{with_ftp}" == "yes"
         --enable-ftp \
 %endif
-%if "%{with_java}" == "yes"
-        --with-java=%{l_prefix}/libexec/j2se \
-%endif
 %if "%{with_oci7}" == "yes"
         --with-oracle \
 %endif
@@ -368,7 +352,7 @@ AutoReqProv:  no
         --without-xsl \
 %endif
 %if "%{with_dom}" == "yes"
-        --enable-dom=%{l_prefix} \
+        --enable-dom \
         --with-libxml-dir=%{l_prefix} \
 %else
         --disable-dom \
@@ -379,9 +363,6 @@ AutoReqProv:  no
 %if "%{with_bc}" == "yes"
         --enable-bcmath \
 %endif
-%if "%{with_transsid}" == "yes"
-        --enable-trans-sid \
-%endif
 %if "%{with_mhash}" == "yes"
         --with-mhash=%{l_prefix} \
 %endif
@@ -398,12 +379,13 @@ AutoReqProv:  no
         --enable-versioning \
 %endif
 %if "%{with_pear}" == "yes"
-        --with-pear \
+        --with-pear=%{l_prefix}/lib/php \
 %else
         --without-pear \
 %endif
 %if "%{with_snmp}" == "yes"
         --with-snmp=%{l_prefix} \
+        --with-openssl-dir=%{l_prefix} \
 %endif
 %if "%{with_odbc}" == "yes"
         --with-unixODBC=%{l_prefix} \
@@ -424,7 +406,6 @@ AutoReqProv:  no
         --enable-cgi \
         --enable-force-cgi-redirect \
         --enable-discard-path \
-        --enable-track-vars \
         --enable-memory-limit
 
     #   build package