X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=372f8fb942c2f52845239e08e80b32a0eec0fb61;hb=33c23a4c361970abdb12e3be36349731ef85f8d8;hp=f4441f735088b4e797aa8a1be403210ca929dc01;hpb=47fea8f8d094df21102f159773aafcd2c3d04f8f;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index f4441f7..372f8fb 100644
--- a/php.spec
+++ b/php.spec
@@ -139,7 +139,6 @@
 %undefine	with_filter
 %endif
 
-%define		rel	1.1
 %define		orgname	php
 %define		php_suffix 56
 Summary:	PHP: Hypertext Preprocessor
@@ -149,8 +148,8 @@ 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.6.30
-Release:	%{rel}
+Version:	5.6.32
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -158,7 +157,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	68753955a8964ae49064c6424f81eb3e
+# Source0-md5:	660cd5bc0f16eaad655b7815c757aadc
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -294,8 +293,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		php_sysconfdir		/etc/%{name}
 %define		php_extensiondir	%{_libdir}/%{name}
-%define		php_datadir	/usr/share/%{name}
-%define		_sysconfdir			%{php_sysconfdir}
+%define		php_datadir		/usr/share/php/%{name}
+%define		_sysconfdir		%{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
 %define		php_api_version		20131106
@@ -584,7 +583,6 @@ Requires:	libtool >= 2:2.4.6
 %{?with_pcre:Requires:	pcre-devel >= 8.10}
 Requires:	shtool
 Provides:	php-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	php-devel
 Obsoletes:	php-pear-devel
 Obsoletes:	php4-devel
 Obsoletes:	php52-devel
@@ -3013,6 +3011,7 @@ fi
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
 %attr(755,root,root) %{_libdir}/libphp_common-*.so
+%dir %{php_datadir}
 %dir %{php_extensiondir}
 
 %doc ext/session/mod_files.sh