Author: glen Date: Tue Sep 5 09:27:35 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge 5.1.6 from HEAD (amd64 bugfix release)
---- Files affected:
SPECS:
php.spec (1.579.2.8 -> 1.579.2.9)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.579.2.8 SPECS/php.spec:1.579.2.9
--- SPECS/php.spec:1.579.2.8 Sat Sep 2 23:58:46 2006
+++ SPECS/php.spec Tue Sep 5 11:27:30 2006
@@ -67,7 +67,7 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%define _rel 2
+%define _rel 1
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
Summary(pl): Język skryptowy PHP
@@ -75,14 +75,14 @@
Summary(ru): PHP ÷ĹŇÓÉÉ 5 - ŃÚŮË ĐŇĹĐŇĎĂĹÓÓÉŇĎ×ÁÎÉŃ HTML-ĆÁĘĚĎ×, ×ŮĐĎĚÎŃĹÍŮĘ
ÎÁ ÓĹŇ×ĹŇĹ
Summary(uk): PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ
ÓĹŇ×ĹŇŚ
Name: php
-Version: 5.1.5
+Version: 5.1.6
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: fb4edd5ed9c536a04a241b52ea62a6c1
-Source1: FAQ.%{name}
+# Source0-md5: 08e423aa314369d4392a36b3f7246afc
+
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -96,7 +96,6 @@
Patch2: %{name}-mail.patch
Patch3: %{name}-link-libs.patch
Patch4: %{name}-libpq_fs_h_path.patch
-Patch5: %{name}-apr-apu.patch
Patch6: %{name}-build_modules.patch
Patch7: %{name}-sapi-ini-file.patch
Patch8: %{name}-no-metaccld.patch
@@ -123,7 +122,8 @@
Patch35: %{name}-versioning.patch
Patch36: %{name}-linkflags-clean.patch
Patch37: %{name}-cli-segv-fixes.patch
-Patch38: %{name}-soap.patch
+Patch38: %{name}-amd64.patch
+Patch39: %{name}-soap.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}
@@ -160,7 +160,7 @@
BuildRequires: libxml2-devel >= 2.5.10
BuildRequires: libxslt-devel >= 1.0.18
%{?with_mhash:BuildRequires: mhash-devel}
-%{?with_ming:BuildRequires: ming-devel >= 0.1.0}
+%{?with_ming:BuildRequires: ming-devel >= 0.2a-11}
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
BuildRequires: mysql-devel >= 4.0.0
%{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0}
@@ -1515,7 +1515,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+
%patch6 -p1
%patch7 -p1
%patch8 -p1
@@ -1548,7 +1548,10 @@
%patch34 -p1
%{?with_versioning:%patch35 -p1}
%patch37 -p1
+%if "%{_lib}" == "lib64"
%patch38 -p1
+%endif
+%patch39 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1835,7 +1838,6 @@
%endif
install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi.ini
install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
-install %{SOURCE1} .
%if %{with apache1}
install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/apache/icons
@@ -2580,7 +2582,7 @@
%dir %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/php.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
%attr(755,root,root) %{_libdir}/libphp_common-*.so
%dir %{extensionsdir}
@@ -3005,6 +3007,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.579.2.9 2006/09/05 09:27:30 glen
+- merge 5.1.6 from HEAD (amd64 bugfix release)
+
Revision 1.579.2.8 2006/09/02 21:58:46 adamg
- bump release for real; release 2 (not 5)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.579.2.8&r2=1.579.2.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
