Adjustment to flatpak tweak.

This commit is contained in:
Gwyn Ciesla 2019-07-30 07:43:53 -05:00
parent e49ba991f2
commit 06538e159a

View File

@ -318,12 +318,17 @@ popd
# Python 3 build: # Python 3 build:
%if 0%{?with_python3} %if 0%{?with_python3}
%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3 %make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3
if [ "%{_prefix}" != "/usr" ]; then
cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/
rm -rf %{buildroot}/usr/*
fi
%if "%py3_sipdir" == "%{_datadir}/sip/PyQt5" %if "%py3_sipdir" == "%{_datadir}/sip/PyQt5"
# copy files to old location for compat purposes temporarily # copy files to old location for compat purposes temporarily
mkdir -p %{buildroot}%{_datadir}/python3-sip mkdir -p %{buildroot}%{_datadir}/python3-sip
cp -alf %{buildroot}%{py3_sipdir} \ cp -alf %{buildroot}%{py3_sipdir} \
%{buildroot}%{_datadir}/python3-sip/PyQt5 %{buildroot}%{_datadir}/python3-sip/PyQt5
%endif %endif
# ensure .so modules are executable for proper -debuginfo extraction # ensure .so modules are executable for proper -debuginfo extraction
for i in %{buildroot}%{python3_sitearch}/PyQt5/*.so %{buildroot}%{python3_dbus_dir}/pyqt5.so ; do for i in %{buildroot}%{python3_sitearch}/PyQt5/*.so %{buildroot}%{python3_dbus_dir}/pyqt5.so ; do
test -x $i || chmod a+rx $i test -x $i || chmod a+rx $i
@ -333,6 +338,10 @@ done
# Python 2 build: # Python 2 build:
%if 0%{?with_python2} %if 0%{?with_python2}
%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
if [ "%{_prefix}" != "/usr" ]; then
cp -ru %{buildroot}/usr/* %{buildroot}%{_prefix}/
rm -rf %{buildroot}/usr/*
fi
# ensure .so modules are executable for proper -debuginfo extraction # ensure .so modules are executable for proper -debuginfo extraction
for i in %{buildroot}%{python2_sitearch}/PyQt5/*.so %{buildroot}%{python2_dbus_dir}/pyqt5.so ; do for i in %{buildroot}%{python2_sitearch}/PyQt5/*.so %{buildroot}%{python2_dbus_dir}/pyqt5.so ; do
test -x $i || chmod a+rx $i test -x $i || chmod a+rx $i