X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=3657f0e84c9f8b98f395341c0b44f5e14f78ddc8;hb=bce0d3c83926023ae512cbe8dc3a362c5ef4f634;hp=d002e4030e279c94abd32ea17a34c37fb00263b2;hpb=3646d9e0c38d7f38aee145ca9c81e86bc486fb03;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index d002e40..3657f0e 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.7
+Version:	7.4.11
 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:	bba97ede87109a2bdaa164e7c2f8d229
+# Source0-md5:	b5e71eecc529621262bbdf5e4bb4986c
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
@@ -172,7 +172,6 @@ Patch43:	%{orgname}-silent-session-cleanup.patch
 Patch44:	%{orgname}-include_path.patch
 Patch50:	extension-shared-optional-dep.patch
 Patch53:	fix-test-run.patch
-Patch55:	bug-52078-fileinode.patch
 Patch59:	%{orgname}-systzdata.patch
 Patch66:	php-db.patch
 Patch67:	mysql-lib-ver-mismatch.patch
@@ -255,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}
 
@@ -572,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
@@ -1842,7 +1840,6 @@ cp -p php.ini-production php.ini
 %patch50 -p1
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-%patch55 -p1
 %patch59 -p1 -b .systzdata
 %patch66 -p1
 %patch67 -p1
@@ -2336,14 +2333,10 @@ 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
 
-# version the .phar files
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/phar{,%{php_suffix}}.phar
-%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/phar{,%{php_suffix}}.1
 # touch for ghost
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/phar
 touch $RPM_BUILD_ROOT%{_bindir}/phar
 touch $RPM_BUILD_ROOT%{_mandir}/man1/phar.1
 
@@ -2769,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*
@@ -3086,7 +3079,6 @@ fi
 %attr(755,root,root) %{php_extensiondir}/phar.so
 %attr(755,root,root) %{_bindir}/phar%{php_suffix}.phar
 %{_mandir}/man1/phar%{php_suffix}.1*
-%{_mandir}/man1/phar.phar.1*
 %ghost %{_bindir}/phar
 %ghost %{_mandir}/man1/phar.1*
 %endif