- fix builddir

diff --git a/php.spec b/php.spec
index 65bb70b2c716518d825e93ed9d39387f8637f856..0f70878865b34f36bb58be47fcdf3bec2cf55c26 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -120,7 +120,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       7.3.22
-Release:       1
+Release:       2
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -2487,7 +2487,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
@@ -2612,17 +2612,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}
@@ -2639,7 +2639,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
@@ -2951,7 +2951,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*