- drop old threads-acfix patch

Changed files:
    php-threads-acfix.patch -> 1.5
    php.spec -> 1.808

diff --git a/php-threads-acfix.patch b/php-threads-acfix.patch
deleted file mode 100644 (file)
index 2245eac..0000000
--- a/php-threads-acfix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -burN php-5.0.4RC1.orig/TSRM/threads.m4 php-5.0.4RC1/TSRM/threads.m4
---- php-5.0.4RC1.orig/TSRM/threads.m4  2005-03-15 18:02:27.630294512 +0100
-+++ php-5.0.4RC1/TSRM/threads.m4       2005-03-15 18:07:05.301082136 +0100
-@@ -116,7 +116,6 @@
- else
-   save_CFLAGS=$CFLAGS
-   save_LIBS=$LIBS
--  PTHREADS_ASSIGN_VARS
-   PTHREADS_CHECK_COMPILE
-   LIBS=$save_LIBS
-   CFLAGS=$save_CFLAGS
-@@ -134,9 +133,10 @@
-         break
-       fi
-     done
-+    pthreads_working=
-   fi
--fi
- ])
-+fi
- 
- AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
- ac_cv_pthreads_lib=
-@@ -163,6 +163,7 @@
- dnl
- dnl
- AC_DEFUN([PTHREADS_ASSIGN_VARS],[
-+if test "$pthreads_assign_done" != "yes" ; then
- if test -n "$ac_cv_pthreads_lib"; then
-   LIBS="$LIBS -l$ac_cv_pthreads_lib"
- fi
-@@ -170,4 +171,6 @@
- if test -n "$ac_cv_pthreads_cflags"; then
-   CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
- fi
-+pthreads_assign_done="yes"
-+fi
- ])dnl

diff --git a/php.spec b/php.spec
index acdce1d47688415ed4659f307d1dc17b5c318f10..49259d9d151c413cc6be40433eac462c9de18c5f 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -108,7 +108,6 @@ Patch7:             %{name}-config-file-scan-dir.patch
 Patch8:                %{name}-sapi-ini-file.patch
 Patch9:                %{name}-sh.patch
 Patch10:       %{name}-ini.patch
-Patch12:       %{name}-threads-acfix.patch
 Patch14:       %{name}-no_pear_install.patch
 Patch15:       %{name}-zlib.patch
 Patch17:       %{name}-readline.patch
@@ -1600,7 +1599,7 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 
 cp php.ini-production php.ini
 %patch10 -p1
-%patch12 -p1
+
 %patch14 -p1
 %patch15 -p1
 %patch17 -p1