[meego-commits] 7676: Changes to devel:qt-mtf/qtwebkit

[Fathi Boudra]

Hi,
I have made the following changes to qtwebkit in project devel:qt-mtf. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #7676:

  submit:   home:boudra:branches:devel:qt-mtf/qtwebkit(r2)(cleanup) -> devel:qt-mtf/qtwebkit


Message:
    * Sat Sep 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 2.1~week37
- Update Qt WebKit to 2.1 weekly build 37
- Bump libqt-devel Requires to 4.7.0 - fix OBS build:
  nothing provides libqt-devel >= 4.7.0~prerelease+beta2

State:   new          2010-09-22T02:38:38 boudra
Comment: None



changes files:
--------------
--- qtwebkit.changes
+++ qtwebkit.changes
@@ -0,0 +1,5 @@
+* Sat Sep 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 2.1~week37
+- Update Qt WebKit to 2.1 weekly build 37
+- Bump libqt-devel Requires to 4.7.0 - fix OBS build:
+  nothing provides libqt-devel >= 4.7.0~prerelease+beta2
+

old:
----
  qtwebkit-2.1-source.tar.gz

spec files:
-----------
--- qtwebkit.spec
+++ qtwebkit.spec
@@ -1,7 +1,7 @@
-# spec file for package qtwebkit (Version 2.1 week build 35)
+# spec file for package qtwebkit (Version 2.1 week build 37)
 
 %define upstream_short_version 2.1
-%define upstream_extra_version week35
+%define upstream_extra_version week37
 
 Name:           qtwebkit
 Version:        %{upstream_short_version}~%{upstream_extra_version}
@@ -45,7 +45,7 @@
 Summary:        Web content engine library for Qt - development files
 Group:          Development/Libraries
 Requires:       lib%{name}4 = %{version}
-Requires:       libqt-devel >= 4.7.0~prerelease+beta2
+Requires:       libqt-devel >= 4.7.0
 
 %description -n lib%{name}-devel
 QtWebKit provides a Web browser engine that makes it easy to embed content from
@@ -65,7 +65,7 @@
 This package contains the WebKit QML plugin for QtDeclarative.
 
 %prep
-%setup -n %{name}-%{upstream_short_version}-source -q
+%setup -n %{name}-%{upstream_short_version}-%{upstream_extra_version}-source -q
 # 0001_fix_symbols_visibility_for_webcore.patch
 %patch0 -p1
 # 01_lflags_as-needed.patch
@@ -92,7 +92,7 @@
 %{_libdir}/libQtWebKit.so.*
 
 %files -n lib%{name}-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/qt4/QtWebKit/QGraphicsWebView
 %{_includedir}/qt4/QtWebKit/QWebDatabase
 %{_includedir}/qt4/QtWebKit/QWebElement
@@ -130,7 +130,7 @@
 %{_datadir}/qt4/mkspecs/modules/qt_webkit_version.pri
 
 %files -n lib%{name}-qmlwebkitplugin
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/qt4/imports/QtWebKit/libqmlwebkitplugin.so
 %{_libdir}/qt4/imports/QtWebKit/qmldir
 

other changes:
--------------

++++++ 04_enable_debug_information.patch
--- 04_enable_debug_information.patch
+++ 04_enable_debug_information.patch
@@ -4,7 +4,7 @@
 
 --- a/WebCore/WebCore.pro
 +++ b/WebCore/WebCore.pro
-@@ -3158,8 +3158,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3166,8 +3166,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
  CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore

++++++ deleted files:
--- qtwebkit-2.1-source.tar.gz