[qt5-qtx11extras] use standard (same as qtbase) .la/.prl sanitation

Rex Dieter rdieter at fedoraproject.org
Mon May 5 14:47:57 UTC 2014


commit 4452c9dbcc097361d5f9be6db820901dd603ec04
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon May 5 09:48:20 2014 -0500

    use standard (same as qtbase) .la/.prl sanitation

 qt5-qtx11extras.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtx11extras.spec b/qt5-qtx11extras.spec
index ecbf573..46607a1 100644
--- a/qt5-qtx11extras.spec
+++ b/qt5-qtx11extras.spec
@@ -4,7 +4,7 @@
 Summary: Qt5 - X11 support library
 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
@@ -46,6 +46,18 @@ make %{?_smp_mflags}
 %install
 make install INSTALL_ROOT=%{buildroot}
 
+## .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
 %postun -p /sbin/ldconfig
@@ -63,11 +75,12 @@ make install INSTALL_ROOT=%{buildroot}
 %{_qt5_libdir}/cmake/Qt5X11Extras/
 %{_qt5_libdir}/pkgconfig/Qt5X11Extras.pc
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_x11extras*.pri
-%exclude %{_qt5_libdir}/libQt5X11Extras.la
-
 
 
 %changelog
+* Mon May 05 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.1-2
+- use standard (same as qtbase) .la/.prl sanitation
+
 * Thu Feb 06 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.1-1
 - 5.2.1
 


More information about the scm-commits mailing list