X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=d0ef890de23cb2a4d004a48c7d5135b944b8d0b0;hb=387db7e5dc4eda39cc2efc82ce7e74c9e4dbcd95;hp=3b89ff3b618eb54e867f29eb54d02b846a2f2da2;hpb=ab7494fe6c60ed61c7f4798c99388426735dd1b0;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 3b89ff3..d0ef890 100644
--- a/php.spec
+++ b/php.spec
@@ -125,7 +125,7 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	7.4.9
+Version:	7.4.13
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -134,7 +134,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	b623bef0da0b7c48477853ca50c989c5
+# Source0-md5:	ccf5b33ab267b742c408d589934a143d
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
@@ -254,7 +254,7 @@ BuildRequires:	apr-util-devel >= 1:1.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		php_sysconfdir		/etc/%{name}
-%define		php_extensiondir	%{_libdir}/%{name}
+%define		php_extensiondir	%{_libdir}/php/%{name}
 %define		php_datadir		/usr/share/php/%{name}
 %define		_sysconfdir		%{php_sysconfdir}
 
@@ -571,7 +571,6 @@ Requires:	libtool >= 2:2.4.6
 Requires:	pcre2-8-devel >= 10.30
 Requires:	shtool
 Provides:	php-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	php-devel
 Obsoletes:	php-pear-devel
 Obsoletes:	php4-devel
 Obsoletes:	php52-devel
@@ -2334,7 +2333,7 @@ install -d \
 cp -pf php_config.h.cli main/php_config.h
 cp -pf Makefile.cli Makefile
 %{__make} install \
-	phpbuilddir=%{_libdir}/%{name}/build \
+	phpbuilddir=%{_libdir}/php/php%{php_suffix}/build \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # touch for ghost
@@ -2763,7 +2762,7 @@ fi
 %attr(755,root,root) %{_libdir}/libphp_common%{php_suffix}.so
 %{_libdir}/libphp_common%{php_suffix}.la
 %{_includedir}/php/php%{php_suffix}
-%{_libdir}/%{name}/build
+%{_libdir}/php/php%{php_suffix}/build
 %{_mandir}/man1/php-config%{php_suffix}.1*
 %ghost %{_mandir}/man1/php-config.1*
 %{_mandir}/man1/phpize%{php_suffix}.1*