devel obsoletes php70-devel

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 5064004da012af8b265001c3a0296302dac8f852..5ac19d5ca5513b353dbf64547cd850ddae7db408 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -77,7 +77,7 @@
 %undefine      with_mm
 %endif
 
-%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
+%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha ppc
 %undefine      with_interbase
 %endif
 %if "%{pld_release}" == "th"
@@ -87,7 +87,7 @@
 %endif
 %endif
 
-%ifnarch %{ix86} %{x8664}
+%ifnarch %{ix86} %{x8664} x32
 # unsupported, see sapi/cgi/fpm/fpm_atomic.h
 %undefine      with_fpm
 %endif
@@ -104,15 +104,15 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %if "%{pld_release}" == "ac"
 %define                magic_mime      /usr/share/file/magic.mime
 %define                _noautoreqdep libphp_common.*
-# if commandline --without was given. respect that
-%if 0%{!?_without_default_php:1}
-%define                with_default_php        1
+# if commandline --with was given. respect that
+%if 0%{!?_with_default_php:1}
+%undefine      with_default_php
 %endif
 %else
 %define                magic_mime      /usr/share/misc/magic.mime
 %endif
 
-%define                rel             9
+%define                rel     12
 %define                orgname php
 %define                ver_suffix 52
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -127,7 +127,10 @@ Name:              %{orgname}%{php_suffix}
 Version:       5.2.17
 Release:       %{backport_date}.%{rel}
 Epoch:         4
-License:       PHP
+# All files licensed under PHP version 3.01, except
+# Zend is licensed under Zend
+# TSRM is licensed under BSD
+License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
 # Source0-md5: b27947f3045220faf16e4d9158cbfe13
@@ -217,6 +220,8 @@ Patch72:    exif-crash-bug-36.patch
 Patch73:       CVE-2013-6420.patch
 Patch74:       CVE-2013-4073.patch
 Patch75:       php-secbug-67498.patch
+Patch76:       CVE-2015-0232.patch
+Patch77:       x32.patch
 # CENTALT patches
 # Backport from 5.3.6
 Patch311:      php-5.3.6-bug-47435.patch
@@ -579,6 +584,9 @@ Obsoletes:  php-pear-devel
 Obsoletes:     php4-devel
 Obsoletes:     php53-devel
 Obsoletes:     php54-devel
+Obsoletes:     php55-devel
+Obsoletes:     php56-devel
+Obsoletes:     php70-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -1937,6 +1945,8 @@ done
 %patch73 -p1
 %patch74 -p1
 %patch75 -p1
+%patch76 -p1
+%patch77 -p1
 
 # Bugfix backport from 5.3.6
 %patch311 -p1 -b .bug-47435