X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=510971195a8d70fe372e00cf95c7d753ed2b94f7;hb=refs%2Fheads%2FPHP_7_2;hp=b04396db65dbc7642d2451e995c64d710b9faa4f;hpb=75235848a2908d89ed17fc9c9c3cdc496ab67ef9;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index b04396d..5109711 100644
--- a/php.spec
+++ b/php.spec
@@ -119,8 +119,8 @@ 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.2.26
-Release:	2
+Version:	7.2.34
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -128,7 +128,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	7afdc506028e8f48e34afd06b62ca1aa
+# Source0-md5:	adb64072b9b7e4634844a72512239a34
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
@@ -259,7 +259,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}
 
@@ -2481,7 +2481,7 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cg
 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
@@ -2606,17 +2606,17 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
 %{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
 
 # use system automake and {lib,sh}tool
-ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build
+ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build
 for fn in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
 	f=%{_aclocaldir}/$fn
 	test -f $f || continue
-	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build
 done
 for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
 	f=/usr/share/libtool/$fn
 	test -f $f || continue
-	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build
 	break
 done
 sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize%{php_suffix}
@@ -2633,7 +2633,7 @@ cp -a tests/* $RPM_BUILD_ROOT%{php_datadir}/tests/php
 # fix install paths, avoid evil rpaths
 sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.la
 # better solution?
-sed -i -e 's|libphp_common.la|$(libdir)/libphp_common%{php_suffix}.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4
+sed -i -e 's|libphp_common.la|$(libdir)/libphp_common%{php_suffix}.la|' $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build/acinclude.m4
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -2945,7 +2945,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*