From a9f73809ceb49a8527bfbf42d9fd5129fbc5a6c8 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 6 Nov 2018 23:58:28 +0000 Subject: [PATCH] rpm: workaround for fpc putting libpas2jslib.so in wrong directory on arch64 git-svn-id: trunk@59476 - --- tools/install/rpm/fpc.spec.template | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/install/rpm/fpc.spec.template b/tools/install/rpm/fpc.spec.template index 71c44b695a..7743ca9c04 100644 --- a/tools/install/rpm/fpc.spec.template +++ b/tools/install/rpm/fpc.spec.template @@ -87,6 +87,11 @@ INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} DATA2INC=${DATA2INC} \ INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/${FPCVERSION} \ INSTALL_BINDIR=%{buildroot}%{_bindir}" make install ${INSTALLOPTS} +%ifarch x86_64 + if [ -f %{buildroot}%{_libdir}/../lib/libpas2jslib.so ]; then + mv %{buildroot}%{_libdir}/../lib/libpas2jslib.so %{buildroot}%{_libdir}/libpas2jslib.so + fi +%endif # create link ln -sf %{_libdir}/%{name}/${FPCVERSION}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname} @@ -112,6 +117,9 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/%{name} +%ifarch x86_64 +%{_prefix}/lib64/lib*.so +%endif %changelog * Sat Feb 25 2017 Mattias Gaertner 3.0.2