[qt5-qtmultimedia] use standard (same as qtbase) .prl sanitation
Rex Dieter
rdieter at fedoraproject.org
Mon May 5 14:41:39 UTC 2014
commit 78e8f54455fc109d0548691658857dd6e6c54647
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon May 5 09:42:00 2014 -0500
use standard (same as qtbase) .prl sanitation
qt5-qtmultimedia.spec | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec
index 89ff1f0..bf30484 100644
--- a/qt5-qtmultimedia.spec
+++ b/qt5-qtmultimedia.spec
@@ -13,7 +13,7 @@
Summary: Qt5 - Multimedia support
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
@@ -95,16 +95,18 @@ make install INSTALL_ROOT=%{buildroot}
make install_docs INSTALL_ROOT=%{buildroot}
%endif
-## .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
+## .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
-## unpackaged files
-# .la files, die, die, die.
-rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -156,6 +158,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la
%changelog
+* Mon May 05 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.1-2
+- use standard (same as qtbase) .prl sanitation
+
* Wed Feb 05 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.1-1
- 5.2.1
More information about the scm-commits
mailing list