Related: rhbz#1150048 rpmdiff: fix rpath for bundled redland libs

f41
David Tardon 10 years ago
parent bd386745c2
commit e0ea397a96

@ -125,6 +125,9 @@ BuildRequires: automake
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils BuildRequires: binutils
BuildRequires: bison BuildRequires: bison
%if 0%{?rhel} && 0%{?rhel} < 7
BuildRequires: chrpath
%endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: findutils BuildRequires: findutils
@ -1173,13 +1176,6 @@ git commit -q -a -m 'add Red Hat colors to palette'
# apply patches # apply patches
git am %{patches} git am %{patches}
# disable failing tests
%if 0%{?rhel}
sed -i -e /CppunitTest_sw_ooxmlsdrexport/d sw/Module_sw.mk
sed -i -e /CppunitTest_sc_ucalc/d sc/Module_sc.mk
git commit -am 'disable failing tests on rhel'
%endif
%if 0%{?rhel} && 0%{?rhel} < 7 %if 0%{?rhel} && 0%{?rhel} < 7
cp -r translations/source/en-GB translations/source/ms cp -r translations/source/en-GB translations/source/ms
cp -r translations/source/en-GB translations/source/ur cp -r translations/source/en-GB translations/source/ur
@ -1436,6 +1432,14 @@ install -p -m 0644 *.ttf %{buildroot}%{_fontdir}
popd popd
rm -rf %{buildroot}%{baseinstdir}/share/fonts rm -rf %{buildroot}%{baseinstdir}/share/fonts
%if 0%{?rhel} && 0%{?rhel} < 7
#fix rpath for redland libs
chrpath -r '$ORIGIN:$ORIGIN/../ure-link/lib' \
%{buildroot}%{baseinstdir}/program/libraptor2-lo.so.0 \
%{buildroot}%{baseinstdir}/program/librasqal-lo.so.3 \
%{buildroot}%{baseinstdir}/program/librdf-lo.so.0
%endif
#ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs
#have snuck through #have snuck through
pic=0 pic=0

Loading…
Cancel
Save