- seems to need newer ming

- compile failure is from threads-acfix.patch

Changed files:
    php.spec -> 1.652

diff --git a/php.spec b/php.spec
index fd82a286b7812782942fa0e504ff28665fd6ca3b..f42b5629070abd0f172d640c2585ac243d7e7950 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,21 +1,4 @@
-# TODO:
-
-Configuring TSRM
-checking for i686-pld-linux-ranlib... no
-checking for ranlib... ranlib
-checking for stdarg.h... (cached) yes
-checking for pthreads_cflags... (cached) -pthread
-checking for pthreads_lib... (cached) pthread
-configure: error: Your system seems to lack POSIX threads.
-error: Bad exit status from /var/tmp/rpm-tmp.2373 (%build)
-
-
-RPM build errors:
-    Bad exit status from /var/tmp/rpm-tmp.2373 (%build)
-
-shell returned 1
-
-
+# TODO
 # - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
 #   - removed from php 5.0 (currently in php4):
 #   db, hyperwave, java, mcal, overload, qtdom
@@ -77,7 +60,7 @@ shell returned 1
 %undefine      with_interbase
 %endif
 
-%if !%{with apache1} && !%{with apache2}
+%if %{without apache1} && %{without apache2}
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
@@ -123,7 +106,7 @@ Patch8:             %{name}-no-metaccld.patch
 Patch9:                %{name}-sh.patch
 Patch10:       %{name}-ini.patch
 Patch11:       %{name}-acam.patch
-Patch15:       %{name}-threads-acfix.patch
+#Patch15:      %{name}-threads-acfix.patch
 Patch16:       %{name}-tsrmlsfetchgcc2.patch
 Patch17:       %{name}-no_pear_install.patch
 Patch18:       %{name}-zlib.patch
@@ -178,7 +161,7 @@ BuildRequires:      libwrap-devel
 BuildRequires: libxml2-devel >= 2.5.10
 BuildRequires: libxslt-devel >= 1.1.0
 %{?with_mhash:BuildRequires:   mhash-devel}
-%{?with_ming:BuildRequires:    ming-devel >= 0.2a-11}
+%{?with_ming:BuildRequires:    ming-devel >= 0.3}
 %{?with_mm:BuildRequires:      mm-devel >= 1.3.0}
 BuildRequires: mysql-devel >= 4.0.0
 %{?with_mysqli:BuildRequires:  mysql-devel >= 4.1.0}
@@ -1576,7 +1559,7 @@ cp php.ini-dist php.ini
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
 %patch11 -p1
-%patch15 -p1
+#%patch15 -p1 # breaks with ac cache vars, but later -lpthread is missing ...
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1