From 24c48c2b473a59f301399279c59b6b9999dbf33a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 5 May 2014 09:49:42 -0500 Subject: [PATCH] use standard (same as qtbase) .prl sanitation --- qt5-qtxmlpatterns.spec | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/qt5-qtxmlpatterns.spec b/qt5-qtxmlpatterns.spec index dd1d111..13ed029 100644 --- a/qt5-qtxmlpatterns.spec +++ b/qt5-qtxmlpatterns.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtXmlPatterns component Name: qt5-%{qt_module} Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -91,16 +91,17 @@ for i in * ; do done popd -## .prl file love (maybe consider just deleting these -- rex -# nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs -sed -i \ - -e "/^QMAKE_PRL_BUILD_DIR/d" \ - -e "/^QMAKE_PRL_LIBS/d" \ - %{buildroot}%{_qt5_libdir}/*.prl - -## unpackaged files -# .la files, die, die, die. -rm -fv %{buildroot}%{_qt5_libdir}/lib*.la +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt5_libdir} +for prl_file in libQt5*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd %post -p /sbin/ldconfig @@ -133,6 +134,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* Mon May 05 2014 Rex Dieter 5.2.1-2 +- use standard (same as qtbase) .prl sanitation + * Wed Feb 05 2014 Rex Dieter 5.2.1-1 - 5.2.1