OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Mar-2003 15:02:31
Branch: HEAD Handle: 2003030714022802
Modified files:
openpkg-src/php php.spec
openpkg-web news.txt
Log:
added PEAR support
Summary:
Revision Changes Path
1.40 +26 -5 openpkg-src/php/php.spec
1.3603 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 php.spec
--- openpkg-src/php/php.spec 20 Feb 2003 18:39:00 -0000 1.39
+++ openpkg-src/php/php.spec 7 Mar 2003 14:02:30 -0000 1.40
@@ -33,7 +33,7 @@
Group: Language
License: PHP
Version: 4.3.1
-Release: 20030220
+Release: 20030307
# list of sources
Source0: http://www.php.net/distributions/php-%{version}.tar.gz
@@ -67,6 +67,7 @@
%option with_wddx no
%option with_gdbm no
%option with_versioning no
+%option with_pear no
# fixing implicit inter-module dependencies and correlations
%if "%{with_freetype}" == "yes"
@@ -184,6 +185,8 @@
%endif
%if "%{with_mysql}" == "yes"
--with-mysql=%{l_prefix} \
+%else
+ --without-mysql \
%endif
%if "%{with_gd}" == "yes"
--with-gd=%{l_prefix} \
@@ -277,6 +280,11 @@
--enable-versioning \
%endif
--enable-cli \
+%if "%{with_pear}" == "yes"
+ --with-pear \
+%else
+ --without-pear \
+%endif
--enable-force-cgi-redirect \
--enable-discard-path \
--enable-track-vars
@@ -291,8 +299,11 @@
$RPM_BUILD_ROOT%{l_prefix}/include/php/main \
$RPM_BUILD_ROOT%{l_prefix}/include/php/Zend \
$RPM_BUILD_ROOT%{l_prefix}/include/php/TSRM \
- $RPM_BUILD_ROOT%{l_prefix}/include/php/regex
- %{l_shtool} install -c -s -m 755 sapi/cli/php $RPM_BUILD_ROOT%{l_prefix}/cgi/
+ $RPM_BUILD_ROOT%{l_prefix}/include/php/regex \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/php
+ %{l_shtool} install -c -s -m 755 \
+ sapi/cli/php \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi/
ln $RPM_BUILD_ROOT%{l_prefix}/cgi/php \
$RPM_BUILD_ROOT%{l_prefix}/bin/php
%{l_shtool} install -c -m 644 /dev/null \
@@ -309,11 +320,21 @@
TSRM/*.h $RPM_BUILD_ROOT%{l_prefix}/include/php/TSRM
%{l_shtool} install -c -m 644 \
regex/*.h $RPM_BUILD_ROOT%{l_prefix}/include/php/regex
+%if "%{with_pear}" == "yes"
+ ( cd $RPM_BUILD_DIR/%{name}-%{version}/pear
+ export INSTALL_ROOT=$RPM_BUILD_ROOT
+ $RPM_BUILD_ROOT%{l_prefix}/bin/php -n -dsafe_mode=0 \
+ install-pear.php package-*.xml
+ $RPM_BUILD_ROOT%{l_prefix}/bin/php -n -dsafe_mode=0 \
+ install-pear.php packages/*.tar
+ ) || exit 1
+%endif
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config %{l_prefix}/etc/php/php.ini'
+ '%config %{l_prefix}/etc/php/php.ini' \
+ '%dir %attr(0755,%{l_musr},%{l_mgrp}) %{l_prefix}/lib/php' \
+ '%not %dir %attr(0644,%{l_musr},%{l_mgrp}) %{l_prefix}/lib/php'
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3602 -r1.3603 news.txt
--- openpkg-web/news.txt 7 Mar 2003 12:56:17 -0000 1.3602
+++ openpkg-web/news.txt 7 Mar 2003 14:02:28 -0000 1.3603
@@ -1,3 +1,4 @@
+07-Mar-2003: Upgraded package: P<php-4.3.1-20030307>
07-Mar-2003: Upgraded package: P<sasl-2.1.12-20030307>
07-Mar-2003: Upgraded package: P<openldap-2.1.14-20030307>
07-Mar-2003: Upgraded package: P<postgresql-7.3.2-20030307>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
