]> git.pld-linux.org Git - packages/qt4.git/commitdiff
Fix broken libQtWebKit.la auto/th/qt4-4.8.2-9
authorJan Rękorajski <baggins@pld-linux.org>
Thu, 30 Aug 2012 05:39:47 +0000 (07:39 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Thu, 30 Aug 2012 05:39:47 +0000 (07:39 +0200)
Release 9

qt4.spec

index dce448b0fa10d252e954e96ce5b9fef4fdea661b..12b1e64910a7428f3b0a82b05e09b52a79f91aa9 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -4,8 +4,6 @@
 #      - more cleanups
 #      - check if translations are available
 #      - check Qt ui tool
-#      - QtWebKit-devel is broken: libQtWebKit.*la contains '-ljscore', it comes
-#        from src/3rdparty/webkit/JavaScriptCore, but jscore lib isn't installed
 #
 # Conditional build:
 %bcond_with    nas             # enable NAS audio support
@@ -55,7 +53,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.8.2
-Release:       8
+Release:       9
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -1597,6 +1595,10 @@ install bin/qdoc3 $RPM_BUILD_ROOT%{_qtdir}/bin/qdoc3
        s|uic_location=.*|uic_location=%{_bindir}/uic-qt4|;
        ' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 
+# libQtWebKit.la contains '-ljscore' and '-lwebcore', they come
+# from src/3rdparty/webkit/{JavaScriptCore,WebCore}} but those libs aren't installed
+%{__sed} -i -e "s,-lwebcore,,g;s,-ljscore,,g;" $RPM_BUILD_ROOT%{_libdir}/libQtWebKit.la
+
 # install tools
 install bin/findtr     $RPM_BUILD_ROOT%{_qtdir}/bin
 
This page took 0.046855 seconds and 4 git commands to generate.