Hi,
I have made the following changes to qt-web-runtime in project Trunk. Please review and accept ASAP.
Thank You,
Rolla Selbak
[This message was auto-generated]
---
Request #9285:
submit: Trunk:Testing/qt-web-runtime(r2) -> Trunk/qt-web-runtime
Message:
Promote to Trunk
State: new 2010-11-08T13:34:47 rolla
Comment: None
changes files:
--------------
--- qt-web-runtime.changes
+++ qt-web-runtime.changes
@@ -0,0 +1,5 @@
+* Sat Sep 04 2010 Fathi Boudra <fathi.boudra at nokia.com> - 1.2~week38
+- Update to 1.2~week38 (BMC#2901)
+- Update qt-web-runtime and qt-web-runtime-devel files
+- Suppress servicefw messages during package installation (BMC#7275)
+
old:
----
01_add_servicefw_basepath.patch
qt-web-runtime-1.2~week35.tar.gz
new:
----
qt-web-runtime-1.2~week38.tar.gz
spec files:
-----------
--- qt-web-runtime.spec
+++ qt-web-runtime.spec
@@ -1,7 +1,7 @@
-# spec file for package qt-web-runtime (Version 1.2 week build 35)
+# spec file for package qt-web-runtime (Version 1.2 week build 38)
%define upstream_short_version 1.2
-%define upstream_extra_version week35
+%define upstream_extra_version week38
Name: qt-web-runtime
Version: %{upstream_short_version}~%{upstream_extra_version}
@@ -11,7 +11,6 @@
Url: http://gitorious.org/qt-web-runtime/qt-web-runtime
Group: System/Libraries
Source: %{name}-%{version}.tar.gz
-Patch0: 01_add_servicefw_basepath.patch
BuildRequires: pkgconfig(QtContacts)
BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(QtWebKit)
@@ -54,8 +53,6 @@
%prep
%setup -q
-# 01_add_servicefw_basepath.patch
-%patch0 -p1
%build
%qmake CONFIG+=linux CONFIG+=rpmbuild SERVICEFW_BASEPATH=/usr/bin
@@ -66,16 +63,13 @@
# Install examples
mkdir -p %{buildroot}%{_libdir}/wrt
cp -rf examples %{buildroot}%{_libdir}/wrt/
-# Fix wrong path in pkgconfig files
-find %{buildroot}%{_libdir}/pkgconfig -type f -name '*.pc' \
--exec perl -pi -e "s, -L%{_builddir}/%{name}-%{version}/?\S+,,g" {} \;
# Remove unpackaged files
rm -f %{buildroot}%{_libdir}/wrtnpjsbinding.pc
%post
-/usr/bin/servicefw --system add /usr/lib/contactserviceplugin.xml
-/usr/bin/servicefw --system add /usr/lib/filesystemserviceplugin.xml
-/usr/bin/servicefw --system add /usr/lib/fileuploadserviceplugin.xml
+/usr/bin/servicefw --system add /usr/lib/contactserviceplugin.xml > /dev/null
+/usr/bin/servicefw --system add /usr/lib/filesystemserviceplugin.xml > /dev/null
+/usr/bin/servicefw --system add /usr/lib/fileuploadserviceplugin.xml > /dev/null
/sbin/ldconfig
%postun
@@ -91,30 +85,29 @@
%config %{_sysconfdir}/wrt/security/browser_trust_policy.xml
%{_sysconfdir}/wrt/security/browser_trust_policy.xml.md5
%config %{_sysconfdir}/wrt/security/mapping.xml
-%config %{_sysconfdir}/wrt/wrtsettings
%{_bindir}/webwidgetrunner
%{_bindir}/widgetinstaller
-%{_libdir}/libCwrtQtBearer.so.*
-%{_libdir}/libDialogsProvider.so.*
-%{_libdir}/libRuntimeCore.so.*
-%{_libdir}/libUserAgent.so.*
-%{_libdir}/libW3CWidgetVerifier.so.*
-%{_libdir}/libWebWidgetFramework.so.*
-%{_libdir}/libWidgetCore.so.*
-%{_libdir}/libWidgetUtils.so.*
-%{_libdir}/libWrtSettings.so.*
-%{_libdir}/libsecmgr.so.*
-%{_libdir}/libwrtnpjsbinding.so.*
-%{_libdir}/libwrtsecurestorage.so.*
-%{_libdir}/libwrtserviceipcclient.so.*
-%{_libdir}/libwrtserviceipcserver.so.*
%{_libdir}/contactserviceplugin.xml
%{_libdir}/filesystemserviceplugin.xml
%{_libdir}/fileuploadserviceplugin.xml
+%{_libdir}/libCwrtQtBearer.so.*
+%{_libdir}/libWrtDialogsProvider.so.*
+%{_libdir}/libWrtIpcClient.so.*
+%{_libdir}/libWrtIpcServer.so.*
+%{_libdir}/libWrtRuntimeCore.so.*
+%{_libdir}/libWrtSecureStorage.so.*
+%{_libdir}/libWrtSecurityManager.so.*
+%{_libdir}/libWrtSettings.so.*
+%{_libdir}/libWrtUserAgent.so.*
+%{_libdir}/libWrtW3CWidgetVerifier.so.*
+%{_libdir}/libWrtWebWidgetFramework.so.*
+%{_libdir}/libWrtWidgetCore.so.*
+%{_libdir}/libWrtWidgetUtils.so.*
%{_libdir}/libcontactserviceplugin.so
%{_libdir}/libfilesystemserviceplugin.so
%{_libdir}/libfileuploadserviceplugin.so
-%{_libdir}/mozilla/plugins/libnpsfwplugin.so
+%{_libdir}/libwrtnpqtjsbinding.so.*
+%{_libdir}/mozilla/plugins/libnpsfwqtplugin.so
%{_datadir}/wrt/widgets_21D_4C7/lib/wrt/device/contacts.js
%{_datadir}/wrt/widgets_21D_4C7/lib/wrt/device/device.js
%{_datadir}/wrt/widgets_21D_4C7/lib/wrt/device/filesystem.js
@@ -124,6 +117,7 @@
%defattr(-,root,root,-)
%{_includedir}/wrt/MiscServices/LocationServices/locationService.h
%{_includedir}/wrt/MiscServices/SchemeServices/SchemeHandler.h
+%{_includedir}/wrt/MiscServices/SchemeServices/customschemehandler.h
%{_includedir}/wrt/ipc/serviceipc/serviceipc.h
%{_includedir}/wrt/ipc/serviceipc/serviceipcclient.h
%{_includedir}/wrt/ipc/serviceipc/serviceipcdefs.h
@@ -135,7 +129,6 @@
%{_includedir}/wrt/runtimecore/qtnstrings.h
%{_includedir}/wrt/runtimecore/resources/qtnresources.h
%{_includedir}/wrt/runtimecore/resources/qtnstrings.h
-%{_includedir}/wrt/runtimecore/resources/wrtversions.h
%{_includedir}/wrt/runtimecore/runtimeglobal.h
%{_includedir}/wrt/runtimecore/webcursornavigation.h
%{_includedir}/wrt/runtimecore/webdirectionalnavigation.h
@@ -165,22 +158,9 @@
%{_includedir}/wrt/security/userconditionhandler.h
%{_includedir}/wrt/security/userconditionserializer.h
%{_includedir}/wrt/security/xmlpolicyserializer.h
-%{_includedir}/wrt/servicefw/errdefs.h
%{_includedir}/wrt/servicefw/iterable.h
-%{_includedir}/wrt/servicefw/service.h
-%{_includedir}/wrt/servicefw/servicebase.h
-%{_includedir}/wrt/servicefw/servicedebug.h
-%{_includedir}/wrt/servicefw/serviceframeworkdefs.h
-%{_includedir}/wrt/servicefw/servicehandler/servicehandler.h
-%{_includedir}/wrt/servicefw/serviceinterfaceinfo.h
-%{_includedir}/wrt/servicefw/serviceplugininterface.h
-%{_includedir}/wrt/servicefw/servicesecurityinterface.h
-%{_includedir}/wrt/servicefw/sfwerrorhandler.h
%{_includedir}/wrt/servicefw/sfwexception.h
%{_includedir}/wrt/servicefw/sfwlog.h
-%{_includedir}/wrt/servicefw/sfwservicelogger.h
-%{_includedir}/wrt/settings/wrtsettings.h
-%{_includedir}/wrt/settings/wrtsettings_global.h
%{_includedir}/wrt/utilities/UserAgent/useragent.h
%{_includedir}/wrt/utilities/W3CWidgetVerifier/DigSigService.h
%{_includedir}/wrt/utilities/W3CWidgetVerifier/SignatureValidator.h
@@ -226,51 +206,31 @@
%{_includedir}/wrt/widgetmanager/webappinfo.h
%{_includedir}/wrt/widgetmanager/widgetinstaller.h
%{_includedir}/wrt/widgetmanager/widgetmanagerconstants.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/CertificateManager.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/DigSigService.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/SignatureValidator.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/crc32.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/crypt.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/deflate.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/inffast.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/inffixed.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/inflate.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/inftrees.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/ioapi.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/signatureparser.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/trees.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/unzip.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/zconf.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/zlib.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/zutil.h
-%{_includedir}/wrt/wrt/widgetmanager/src/private/zlib/zzip.h
%{_libdir}/libCwrtQtBearer.so
-%{_libdir}/libDialogsProvider.prl
-%{_libdir}/libDialogsProvider.so
-%{_libdir}/libRuntimeCore.prl
-%{_libdir}/libRuntimeCore.so
-%{_libdir}/libUserAgent.so
-%{_libdir}/libW3CWidgetVerifier.prl
-%{_libdir}/libW3CWidgetVerifier.so
-%{_libdir}/libWebWidgetFramework.prl
-%{_libdir}/libWebWidgetFramework.so
-%{_libdir}/libWidgetCore.prl
-%{_libdir}/libWidgetCore.so
-%{_libdir}/libWidgetUtils.prl
-%{_libdir}/libWidgetUtils.so
+%{_libdir}/libWrtDialogsProvider.prl
+%{_libdir}/libWrtDialogsProvider.so
+%{_libdir}/libWrtIpcClient.prl
+%{_libdir}/libWrtIpcClient.so
+%{_libdir}/libWrtIpcServer.prl
+%{_libdir}/libWrtIpcServer.so
+%{_libdir}/libWrtRuntimeCore.prl
+%{_libdir}/libWrtRuntimeCore.so
+%{_libdir}/libWrtSecureStorage.prl
+%{_libdir}/libWrtSecureStorage.so
+%{_libdir}/libWrtSecurityManager.prl
+%{_libdir}/libWrtSecurityManager.so
%{_libdir}/libWrtSettings.prl
%{_libdir}/libWrtSettings.so
-%{_libdir}/libsecmgr.prl
-%{_libdir}/libsecmgr.so
-%{_libdir}/libwrtnpjsbinding.prl
-%{_libdir}/libwrtnpjsbinding.so
-%{_libdir}/libwrtsecurestorage.prl
-%{_libdir}/libwrtsecurestorage.so
-%{_libdir}/libwrtserviceipcclient.prl
-%{_libdir}/libwrtserviceipcclient.so
-%{_libdir}/libwrtserviceipcserver.prl
-%{_libdir}/libwrtserviceipcserver.so
-%{_libdir}/pkgconfig/wrtnpjsbinding.pc
+%{_libdir}/libWrtUserAgent.so
+%{_libdir}/libWrtW3CWidgetVerifier.prl
+%{_libdir}/libWrtW3CWidgetVerifier.so
+%{_libdir}/libWrtWebWidgetFramework.prl
+%{_libdir}/libWrtWebWidgetFramework.so
+%{_libdir}/libWrtWidgetCore.prl
+%{_libdir}/libWrtWidgetCore.so
+%{_libdir}/libWrtWidgetUtils.prl
+%{_libdir}/libWrtWidgetUtils.so
+%{_libdir}/libwrtnpqtjsbinding.so
%files examples
%defattr(-,root,root,-)
other changes:
--------------
++++++ qt-web-runtime-1.2~week35.tar.gz -> qt-web-runtime-1.2~week38.tar.gz
803773 lines of diff (skipped)
++++++ deleted files:
--- 01_add_servicefw_basepath.patch