[packages/php] up to 5.3.24
glen
glen at pld-linux.org
Wed Apr 17 12:34:37 CEST 2013
commit 872d57a470fd587b46209b2ec977dff5b3952487
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Apr 17 13:34:30 2013 +0300
up to 5.3.24
pcre-shared.patch | 9 ---------
php.spec | 6 +++---
2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/php.spec b/php.spec
index 7179ac8..cb85880 100644
--- a/php.spec
+++ b/php.spec
@@ -118,7 +118,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
%define php_suffix %{nil}
%endif
-%define rel 2
+%define rel 1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -126,13 +126,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 5.3.23
+Version: 5.3.24
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: ab7bd1dd3bbc8364cb9fcaa2d79fb502
+# Source0-md5: 9820604df98c648297dcd31ffb8214e8
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
diff --git a/pcre-shared.patch b/pcre-shared.patch
index 39632a0..5528b7f 100644
--- a/pcre-shared.patch
+++ b/pcre-shared.patch
@@ -34,15 +34,6 @@
else
AC_MSG_CHECKING([for PCRE library to use])
AC_MSG_RESULT([bundled])
-@@ -59,7 +60,7 @@
- pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \
- pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c \
- pcrelib/pcre_version.c pcrelib/pcre_xclass.c"
-- PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,-I at ext_srcdir@/pcrelib)
-+ PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, $ext_shared,,-I at ext_srcdir@/pcrelib)
- PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
- PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
- AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
--- php-5.3.1/ext/pcre/php_pcre.h 2009-11-30 20:59:04.046581246 +0200
+++ php-5.3.1.pcre/ext/pcre/php_pcre.h 2009-11-30 21:38:06.435493243 +0000
@@ -34,7 +34,12 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/872d57a470fd587b46209b2ec977dff5b3952487
More information about the pld-cvs-commit
mailing list