OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2004 20:25:56
Branch: HEAD Handle: 2004042119255600
Modified files:
openpkg-src/php5 php5.spec
Log:
synchronize php5 with php package
Summary:
Revision Changes Path
1.12 +48 -7 openpkg-src/php5/php5.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php5/php5.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 php5.spec
--- openpkg-src/php5/php5.spec 3 Apr 2004 07:49:08 -0000 1.11
+++ openpkg-src/php5/php5.spec 21 Apr 2004 18:25:56 -0000 1.12
@@ -34,7 +34,7 @@
Group: Language
License: PHP
Version: 5.0.0RC1
-Release: 20040403
+Release: 20040421
# package options
%option with_calendar no
@@ -65,12 +65,18 @@
%option with_transsid no
%option with_curl no
%option with_mhash no
+%option with_mcrypt no
%option with_wddx no
%option with_gdbm no
%option with_versioning no
-%option with_pear no
%option with_snmp no
+%option with_odbc no
+%option with_mbregex no
+%option with_mbstring no
+%option with_exif no
%option with_iconv no
+%option with_sendmail no
+%option with_pear no
# fixing implicit extension dependencies and correlations
%if "%{with_pear}" == "yes"
@@ -189,6 +195,10 @@
BuildPreReq: mhash
PreReq: mhash
%endif
+%if "%{with_mcrypt}" == "yes"
+BuildPreReq: libmcrypt
+PreReq: libmcrypt
+%endif
%if "%{with_gdbm}" == "yes"
BuildPreReq: gdbm, gdbm::with_ndbm = yes
PreReq: gdbm, gdbm::with_ndbm = yes
@@ -200,6 +210,14 @@
BuildPreReq: snmp
PreReq: snmp
%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
+%if "%{with_sendmail}" == "yes"
+BuildPreReq: MTA
+PreReq: MTA
+%endif
AutoReq: no
AutoReqProv: no
@@ -224,6 +242,10 @@
%prep
%setup -q -n php-%{version}
+ %{l_shtool} subst \
+ -e 's;\(/include\)/freetype2;\1;' \
+ configure \
+ ext/gd/config.m4
%build
# configure package
@@ -258,7 +280,11 @@
CPPFLAGS="$cppflags" \
LDFLAGS="$ldflags" \
LIBS="$libs" \
+%if "%{with_sendmail}" == "yes"
PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
+%else
+ PROG_SENDMAIL="`%{l_shtool} path false`" \
+%endif
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/php5 \
@@ -369,6 +395,9 @@
%if "%{with_mhash}" == "yes"
--with-mhash=%{l_prefix} \
%endif
+%if "%{with_mcrypt}" == "yes"
+ --with-mcrypt=%{l_prefix} \
+%endif
%if "%{with_curl}" == "yes"
--with-curl=%{l_prefix} \
%endif
@@ -386,6 +415,18 @@
%if "%{with_snmp}" == "yes"
--with-snmp=%{l_prefix} \
%endif
+%if "%{with_odbc}" == "yes"
+ --with-unixODBC=%{l_prefix} \
+%endif
+%if "%{with_mbregex}" == "yes"
+ --enable-mbregex \
+%endif
+%if "%{with_mbstring}" == "yes"
+ --enable-mbstring \
+%endif
+%if "%{with_exif}" == "yes"
+ --with-exif \
+%endif
%if "%{with_iconv}" == "yes"
--with-iconv=%{l_prefix} \
%endif
@@ -432,16 +473,16 @@
$RPM_BUILD_ROOT%{l_prefix}/bin/`echo $bin | sed -e 's;^php;php5;'`
done
- # strip down installation
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
- rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-
# install default configuration file
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/php5
%{l_shtool} install -c -m 644 /dev/null \
$RPM_BUILD_ROOT%{l_prefix}/etc/php5/php.ini
+
+ # strip down installation
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
