X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=d5dbccaada46e2d777fff712c1a75a01aa55e1db;hb=4747f5dfd0b93ff510b9242a019b648a437093a9;hp=e3a15c4944dae0f026c07139ebf25d5962673873;hpb=f5482f8632f709a539a3eb093fe30d141776512d;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index e3a15c4..d5dbcca 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
@@ -170,7 +169,6 @@ Source13:	dep-tests.sh
 Source14:	skip-tests.sh
 Patch0:		%{orgname}-shared.patch
 Patch1:		%{orgname}-tld.patch
-Patch2:		%{orgname}-mail.patch
 Patch3:		%{orgname}-link-libs.patch
 Patch4:		php-bug-71475.patch
 Patch5:		%{orgname}-filter-shared.patch
@@ -202,8 +200,6 @@ Patch41:	%{orgname}-fpm-config.patch
 Patch42:	%{orgname}-fpm-shared.patch
 Patch43:	%{orgname}-silent-session-cleanup.patch
 Patch44:	%{orgname}-include_path.patch
-Patch45:	%{orgname}-imap-annotations.patch
-Patch46:	%{orgname}-imap-myrights.patch
 Patch47:	suhosin.patch
 Patch50:	extension-shared-optional-dep.patch
 Patch51:	spl-shared.patch
@@ -297,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
@@ -1996,7 +1992,6 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 cp -p php.ini-production php.ini
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -2030,8 +2025,6 @@ cp -p php.ini-production php.ini
 %endif
 %patch43 -p1
 %patch44 -p1
-#%patch45 -p1 # imap annotations. fixme
-#%patch46 -p1 # imap myrights. fixme
 %if %{with suhosin}
 %patch47 -p1
 %endif
@@ -3019,6 +3012,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