Author: glen Date: Fri Nov 3 00:28:22 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- removed dropped files, cleanups
- filter depends on pcre
- enable zip extension (shared)
- tested that php can be compiled without pcre
---- Files affected:
SPECS:
php.spec (1.595 -> 1.596)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.595 SPECS/php.spec:1.596
--- SPECS/php.spec:1.595 Fri Nov 3 00:37:53 2006
+++ SPECS/php.spec Fri Nov 3 01:28:17 2006
@@ -10,6 +10,8 @@
# db, hyperwave, java, mcal, overload, qtdom
# and removed from php 5.1:
# cpdf, fam, yp, oracle
+# and removed from php 5.2:
+# filepro, hw
# - mime_magic can't handle new "string/*" entries in magic.mime
# - make additional headers added by mail patch configurable
# - apply -hardened patch by default ?
@@ -119,6 +121,7 @@
Patch35: %{name}-versioning.patch
Patch36: %{name}-linkflags-clean.patch
Patch38: %{name}-amd64.patch
+Patch39: %{name}-pear.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1502,6 +1505,7 @@
%if "%{_lib}" == "lib64"
%patch38 -p1
%endif
+%patch39 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1675,7 +1679,7 @@
%{?with_oci8:--with-oci8=shared} \
%{?with_openssl:--with-openssl=shared} \
--with-kerberos \
- %{!?with_pcre:--without-pcre-regex}%{?with_pcre:--with-pcre-regex=/usr}
\
+ %{!?with_pcre:--without-pcre-regex
--disable-filter}%{?with_pcre:--with-pcre-regex=/usr} \
--with-pear=%{php_pear_dir} \
%{!?with_pgsql:--without-pgsql}%{?with_pgsql:--with-pgsql=shared,/usr} \
--with-png-dir=/usr \
@@ -1695,7 +1699,8 @@
%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
--with-xsl=shared \
--with-zlib=shared \
- --with-zlib-dir=shared,/usr
+ --with-zlib-dir=shared,/usr \
+ --enable-zip=shared,/usr \
cp -f Makefile Makefile.$sapi
cp -f main/php_config.h php_config.h.$sapi
@@ -1703,12 +1708,8 @@
# must make this first, so modules can link against it.
%{__make} libphp_common.la
-
%{__make} build-modules
-# fix install paths, avoid evil rpaths
-#sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
-
%if %{with apache1}
%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
%endif
@@ -1774,9 +1775,6 @@
install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
-# as of 5.0.5, phpextdist isn't installed by default
-install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
-
ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini >
$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
@@ -2506,10 +2504,6 @@
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{extensionsdir}
-# session_mm doesn't work with shared session
-#%files session
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{extensionsdir}/session.so
%doc ext/session/mod_files.sh
%files devel
@@ -2517,7 +2511,6 @@
%doc README.UNIX-BUILD-SYSTEM
%doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS
%doc CODING_STANDARDS
-%attr(755,root,root) %{_bindir}/phpextdist
%attr(755,root,root) %{_bindir}/phpize
%attr(755,root,root) %{_bindir}/php-config
%attr(755,root,root) %{_libdir}/libphp_common.so
@@ -2908,6 +2901,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.596 2006/11/03 00:28:17 glen
+- removed dropped files, cleanups
+- filter depends on pcre
+- enable zip extension (shared)
+- tested that php can be compiled without pcre
+
Revision 1.595 2006/11/02 23:37:53 glen
- ini-search-path.patch resolved upstream
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.595&r2=1.596&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
