[meego-commits] 9568: Changes to Trunk/qt-mobility

Peter Zhu no_reply at build.meego.com
Thu Nov 18 09:48:16 UTC 2010 

Hi,
I have made the following changes to qt-mobility in project Trunk. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #9568:

  submit:   Trunk:Testing/qt-mobility(r13) -> Trunk/qt-mobility


Message:
    Move to Trunk

State:   new          2010-11-18T01:47:48 peter
Comment: None



changes files:
--------------
--- qt-mobility.changes
+++ qt-mobility.changes
@@ -0,0 +1,15 @@
+* Wed Nov 10 2010 Fathi Boudra <fathi.boudra at nokia.com> - 1.1.0
+- Update to Qt Mobility 1.1.0
+- Update Qt Mobility url 
+- Update fix_translations_install_path.patch to build the translations
+- Remove patches:
+  ftbfs_multimedia_examples.patch - fixed upstream
+  qmf_2010w36_support.patch - merged upstream
+  gstreamer_mediacapture_backend_bmc9202.patch - cherry-picked upstream (BMC#9202)
+- Add patches:
+  enable_camerabin_with_meego_target.patch - Thanks to Teemu Tuominen (BMC#6878)
+- Add build requirements: gstreamer-plugins-bad-free-0.10 and udev
+- Add Qt Mobility Feedback and Organizer QML plugins packages
+- Fix some rpmlint warnings (executable permissions and duplicate files)
+- Update %files tag (less verbose on the headers and demos/examples)
+

old:
----
  ftbfs_multimedia_examples.patch
  gstreamer_mediacapture_backend_bmc9202.patch
  qmf_2010w36_support.patch
  qt-mobility-opensource-src-1.1.0-beta2.tar.gz

new:
----
  enable_camerabin_with_meego_target.patch
  qt-mobility-opensource-src-1.1.0.tar.gz

spec files:
-----------
--- qt-mobility.spec
+++ qt-mobility.spec
@@ -7,26 +7,24 @@
 
 Name:       qt-mobility
 Summary:    APIs for mobile device functionality
-Version:    1.1.0~beta2
+Version:    1.1.0
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1 with exception or GPLv3
 URL:        http://qt.gitorious.org/qt-mobility
-Source0:    http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-1.1.0-beta2.tar.gz
+Source0:    http://get.qt.nokia.com/qt/add-ons/%{name}-opensource-src-%{version}.tar.gz
 Source100:  qt-mobility.yaml
 Patch0:     no_rpath.patch
-Patch1:     ftbfs_multimedia_examples.patch
-Patch2:     fix_translations_install_path.patch
-Patch3:     GL_CLAMP_TO_EDGE_of_video_texture.patch
-Patch4:     add_meego_build_flag.patch
-Patch5:     enable_pkgconfig_support.patch
-Patch6:     enable_tracker_contacts_engine.patch
-Patch7:     enable_sensorfw_support.patch
-Patch8:     add_location_api_meego_implementation_using_geoclue.patch
-Patch9:     use_isabspath.patch
-Patch10:     qmf_2010w36_support.patch
-Patch11:     fix_bmc_8705.patch
-Patch12:     gstreamer_mediacapture_backend_bmc9202.patch
+Patch1:     fix_translations_install_path.patch
+Patch2:     GL_CLAMP_TO_EDGE_of_video_texture.patch
+Patch3:     add_meego_build_flag.patch
+Patch4:     enable_pkgconfig_support.patch
+Patch5:     enable_tracker_contacts_engine.patch
+Patch6:     enable_sensorfw_support.patch
+Patch7:     add_location_api_meego_implementation_using_geoclue.patch
+Patch8:     use_isabspath.patch
+Patch9:     fix_bmc_8705.patch
+Patch10:     enable_camerabin_with_meego_target.patch
 Requires:   libqtcontacts1 = %{version}
 Requires:   libqtfeedback1 = %{version}
 Requires:   libqtgallery1 = %{version}
@@ -47,12 +45,14 @@
 BuildRequires:  pkgconfig(contextsubscriber-1.0)
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(geoclue)
+BuildRequires:  pkgconfig(gstreamer-plugins-bad-free-0.10)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
 BuildRequires:  pkgconfig(gypsy)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(qttracker)
 BuildRequires:  pkgconfig(qmfclient)
 BuildRequires:  pkgconfig(sensord)
+BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrandr)
@@ -279,6 +279,17 @@
 This package contains the Contacts QML plugin for QtDeclarative.
 
 
+%package -n libdeclarative-feedback
+Summary:    Qt Mobility Feedback QML plugin
+Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description -n libdeclarative-feedback
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Feedback QML plugin for QtDeclarative.
+
+
 %package -n libdeclarative-gallery
 Summary:    Qt Mobility Document Gallery QML plugin
 Group:      System/Libraries
@@ -323,6 +334,17 @@
 This package contains the Multimedia QML plugin for QtDeclarative.
 
 
+%package -n libdeclarative-organizer
+Summary:    Qt Mobility Organizer QML plugin
+Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description -n libdeclarative-organizer
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Organizer QML plugin for QtDeclarative.
+
+
 %package -n libdeclarative-publishsubscribe
 Summary:    Qt Mobility Publish and Subscribe QML plugin
 Group:      System/Libraries
@@ -383,8 +405,6 @@
 Summary:    Qt Mobility examples
 Group:      System/X11
 Requires:   %{name} = %{version}-%{release}
-Requires(post): /bin/touch
-Requires(post): gtk2
 
 %description examples
 Qt Mobility delivers a set of new APIs for mobile device functionality.
@@ -405,34 +425,30 @@
 
 
 %prep
-%setup -q -n %{name}-opensource-src-1.1.0-beta2
+%setup -q -n %{name}-opensource-src-%{version}
 
 # no_rpath.patch
 %patch0 -p1
-# ftbfs_multimedia_examples.patch
-%patch1 -p1
 # fix_translations_install_path.patch
-%patch2 -p1
+%patch1 -p1
 # GL_CLAMP_TO_EDGE_of_video_texture.patch
-%patch3 -p1
+%patch2 -p1
 # add_meego_build_flag.patch
-%patch4 -p1
+%patch3 -p1
 # enable_pkgconfig_support.patch
-%patch5 -p1
+%patch4 -p1
 # enable_tracker_contacts_engine.patch
-%patch6 -p1
+%patch5 -p1
 # enable_sensorfw_support.patch
-%patch7 -p1
+%patch6 -p1
 # add_location_api_meego_implementation_using_geoclue.patch
-%patch8 -p1
+%patch7 -p1
 # use_isabspath.patch
+%patch8 -p1
+# fix_bmc_8705.patch
 %patch9 -p1
-# qmf_2010w36_support.patch
+# enable_camerabin_with_meego_target.patch
 %patch10 -p1
-# fix_bmc_8705.patch
-%patch11 -p1
-# gstreamer_mediacapture_backend_bmc9202.patch
-%patch12 -p1
 # >> setup
 # << setup
 
@@ -469,9 +485,17 @@
 %qmake_install
 # Fix wrong path in pkgconfig files
 find %{buildroot}%{_libdir}/pkgconfig -type f -name '*.pc' \
--exec perl -pi -e "s, -L%{_builddir}/%{name}-opensource-src-1.1.0-beta2/?\S+,,g" {} \;
+-exec perl -pi -e "s, -L%{_builddir}/%{name}-opensource-src-%{version}/?\S+,,g" {} \;
+# Fix executable permissions
+find %{buildroot}%{_libdir}/qtmobility -type f -executable \( -false \
+-o -name \*.qml \
+-o -name \*.sci \
+\) | xargs chmod -x
+# Fix duplicate files
+%fdupes %{buildroot}%{_includedir}
+%fdupes %{buildroot}%{_libdir}/qtmobility
 # << install post
-%fdupes  %{buildroot}/%{_includedir}
+%fdupes  %{buildroot}/%{_datadir}/qtmobility/translations
 
 
 
@@ -577,15 +601,13 @@
 
 
 
-%post examples
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache \
-  --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
-
-%postun examples
-/bin/touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache \
-  --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+
+
+
+
+
+
+
 
 
 
@@ -604,6 +626,7 @@
 %{_bindir}/servicedbgen
 %{_bindir}/servicexmlgen
 %{_bindir}/vsexplorer
+%{_includedir}/QtContacts/*.h
 %{_includedir}/QtContacts/QContact
 %{_includedir}/QtContacts/QContactAbstractRequest
 %{_includedir}/QtContacts/QContactAction
@@ -629,6 +652,7 @@
 %{_includedir}/QtContacts/QContactEmailAddress
 %{_includedir}/QtContacts/QContactFamily
 %{_includedir}/QtContacts/QContactFavorite
+%{_includedir}/QtContacts/QContactFetchByIdRequest
 %{_includedir}/QtContacts/QContactFetchHint
 %{_includedir}/QtContacts/QContactFetchRequest
 %{_includedir}/QtContacts/QContactFilter
@@ -636,6 +660,7 @@
 %{_includedir}/QtContacts/QContactGeoLocation
 %{_includedir}/QtContacts/QContactGlobalPresence
 %{_includedir}/QtContacts/QContactGuid
+%{_includedir}/QtContacts/QContactHobby
 %{_includedir}/QtContacts/QContactId
 %{_includedir}/QtContacts/QContactIntersectionFilter
 %{_includedir}/QtContacts/QContactInvalidFilter
@@ -644,6 +669,7 @@
 %{_includedir}/QtContacts/QContactManager
 %{_includedir}/QtContacts/QContactManagerEngine
 %{_includedir}/QtContacts/QContactManagerEngineFactory
+%{_includedir}/QtContacts/QContactManagerEngineV2
 %{_includedir}/QtContacts/QContactName
 %{_includedir}/QtContacts/QContactNickname
 %{_includedir}/QtContacts/QContactNote
@@ -667,74 +693,7 @@
 %{_includedir}/QtContacts/QContactType
 %{_includedir}/QtContacts/QContactUnionFilter
 %{_includedir}/QtContacts/QContactUrl
-%{_includedir}/QtContacts/qcontact.h
-%{_includedir}/QtContacts/qcontactabstractrequest.h
-%{_includedir}/QtContacts/qcontactaction.h
-%{_includedir}/QtContacts/qcontactactiondescriptor.h
-%{_includedir}/QtContacts/qcontactactionfactory.h
-%{_includedir}/QtContacts/qcontactactionfilter.h
-%{_includedir}/QtContacts/qcontactactiontarget.h
-%{_includedir}/QtContacts/qcontactaddress.h
-%{_includedir}/QtContacts/qcontactanniversary.h
-%{_includedir}/QtContacts/qcontactavatar.h
-%{_includedir}/QtContacts/qcontactbirthday.h
-%{_includedir}/QtContacts/qcontactchangelogfilter.h
-%{_includedir}/QtContacts/qcontactchangeset.h
-%{_includedir}/QtContacts/qcontactdetail.h
-%{_includedir}/QtContacts/qcontactdetaildefinition.h
-%{_includedir}/QtContacts/qcontactdetaildefinitionfetchrequest.h
-%{_includedir}/QtContacts/qcontactdetaildefinitionremoverequest.h
-%{_includedir}/QtContacts/qcontactdetaildefinitionsaverequest.h
-%{_includedir}/QtContacts/qcontactdetailfielddefinition.h
-%{_includedir}/QtContacts/qcontactdetailfilter.h
-%{_includedir}/QtContacts/qcontactdetailrangefilter.h
-%{_includedir}/QtContacts/qcontactdetails.h
-%{_includedir}/QtContacts/qcontactdisplaylabel.h
-%{_includedir}/QtContacts/qcontactemailaddress.h
-%{_includedir}/QtContacts/qcontactfamily.h
-%{_includedir}/QtContacts/qcontactfavorite.h
-%{_includedir}/QtContacts/qcontactfetchhint.h
-%{_includedir}/QtContacts/qcontactfetchrequest.h
-%{_includedir}/QtContacts/qcontactfilter.h
-%{_includedir}/QtContacts/qcontactfilters.h
-%{_includedir}/QtContacts/qcontactgender.h
-%{_includedir}/QtContacts/qcontactgeolocation.h
-%{_includedir}/QtContacts/qcontactglobalpresence.h
-%{_includedir}/QtContacts/qcontactguid.h
-%{_includedir}/QtContacts/qcontactid.h
-%{_includedir}/QtContacts/qcontactintersectionfilter.h
-%{_includedir}/QtContacts/qcontactinvalidfilter.h
-%{_includedir}/QtContacts/qcontactlocalidfetchrequest.h
-%{_includedir}/QtContacts/qcontactlocalidfilter.h
-%{_includedir}/QtContacts/qcontactmanager.h
-%{_includedir}/QtContacts/qcontactmanagerengine.h
-%{_includedir}/QtContacts/qcontactmanagerenginefactory.h
-%{_includedir}/QtContacts/qcontactname.h
-%{_includedir}/QtContacts/qcontactnickname.h
-%{_includedir}/QtContacts/qcontactnote.h
-%{_includedir}/QtContacts/qcontactonlineaccount.h
-%{_includedir}/QtContacts/qcontactorganization.h
-%{_includedir}/QtContacts/qcontactphonenumber.h
-%{_includedir}/QtContacts/qcontactpresence.h
-%{_includedir}/QtContacts/qcontactrelationship.h
-%{_includedir}/QtContacts/qcontactrelationshipfetchrequest.h
-%{_includedir}/QtContacts/qcontactrelationshipfilter.h
-%{_includedir}/QtContacts/qcontactrelationshipremoverequest.h
-%{_includedir}/QtContacts/qcontactrelationshipsaverequest.h
-%{_includedir}/QtContacts/qcontactremoverequest.h
-%{_includedir}/QtContacts/qcontactrequests.h
-%{_includedir}/QtContacts/qcontactringtone.h
-%{_includedir}/QtContacts/qcontactsaverequest.h
-%{_includedir}/QtContacts/qcontactsortorder.h
-%{_includedir}/QtContacts/qcontactsynctarget.h
-%{_includedir}/QtContacts/qcontacttag.h
-%{_includedir}/QtContacts/qcontactthumbnail.h
-%{_includedir}/QtContacts/qcontacttimestamp.h
-%{_includedir}/QtContacts/qcontacttype.h
-%{_includedir}/QtContacts/qcontactunionfilter.h
-%{_includedir}/QtContacts/qcontacturl.h
-%{_includedir}/QtContacts/qtcontacts.h
-%{_includedir}/QtContacts/qtcontactsglobal.h
+%{_includedir}/QtFeedback/*.h
 %{_includedir}/QtFeedback/QFeedbackActuator
 %{_includedir}/QtFeedback/QFeedbackEffect
 %{_includedir}/QtFeedback/QFeedbackFileEffect
@@ -743,9 +702,7 @@
 %{_includedir}/QtFeedback/QFeedbackHapticsInterface
 %{_includedir}/QtFeedback/QFeedbackInterface
 %{_includedir}/QtFeedback/QFeedbackThemeInterface
-%{_includedir}/QtFeedback/qfeedbackactuator.h
-%{_includedir}/QtFeedback/qfeedbackeffect.h
-%{_includedir}/QtFeedback/qfeedbackplugininterfaces.h
+%{_includedir}/QtGallery/*.h
 %{_includedir}/QtGallery/QAbstractGallery
 %{_includedir}/QtGallery/QDocumentGallery
 %{_includedir}/QtGallery/QGalleryAbstractRequest
@@ -754,38 +711,23 @@
 %{_includedir}/QtGallery/QGalleryIntersectionFilter
 %{_includedir}/QtGallery/QGalleryItemRequest
 %{_includedir}/QtGallery/QGalleryMetaDataFilter
-%{_includedir}/QtGallery/QGalleryProperty
 %{_includedir}/QtGallery/QGalleryQueryModel
 %{_includedir}/QtGallery/QGalleryQueryRequest
-%{_includedir}/QtGallery/QGalleryRemoveRequest
 %{_includedir}/QtGallery/QGalleryResource
 %{_includedir}/QtGallery/QGalleryResultSet
-%{_includedir}/QtGallery/QGalleryType
 %{_includedir}/QtGallery/QGalleryTypeRequest
 %{_includedir}/QtGallery/QGalleryUnionFilter
-%{_includedir}/QtGallery/qabstractgallery.h
-%{_includedir}/QtGallery/qdocumentgallery.h
-%{_includedir}/QtGallery/qgalleryabstractrequest.h
-%{_includedir}/QtGallery/qgalleryabstractresponse.h
-%{_includedir}/QtGallery/qgalleryfilter.h
-%{_includedir}/QtGallery/qgalleryitemrequest.h
-%{_includedir}/QtGallery/qgalleryproperty.h
-%{_includedir}/QtGallery/qgalleryquerymodel.h
-%{_includedir}/QtGallery/qgalleryqueryrequest.h
-%{_includedir}/QtGallery/qgalleryremoverequest.h
-%{_includedir}/QtGallery/qgalleryresource.h
-%{_includedir}/QtGallery/qgalleryresultset.h
-%{_includedir}/QtGallery/qgallerytype.h
-%{_includedir}/QtGallery/qgallerytyperequest.h
+%{_includedir}/QtLocation/*.h
 %{_includedir}/QtLocation/QGeoAddress
 %{_includedir}/QtLocation/QGeoAreaMonitor
 %{_includedir}/QtLocation/QGeoBoundingArea
 %{_includedir}/QtLocation/QGeoBoundingBox
 %{_includedir}/QtLocation/QGeoBoundingCircle
 %{_includedir}/QtLocation/QGeoCoordinate
-%{_includedir}/QtLocation/QGeoInstruction
+%{_includedir}/QtLocation/QGeoManeuver
 %{_includedir}/QtLocation/QGeoMapCircleObject
 %{_includedir}/QtLocation/QGeoMapData
+%{_includedir}/QtLocation/QGeoMapGroupObject
 %{_includedir}/QtLocation/QGeoMapObject
 %{_includedir}/QtLocation/QGeoMapObjectInfo
 %{_includedir}/QtLocation/QGeoMapOverlay
@@ -830,8 +772,6 @@
 %{_includedir}/QtLocation/QLandmarkCategoryIdFetchRequest
 %{_includedir}/QtLocation/QLandmarkCategoryRemoveRequest
 %{_includedir}/QtLocation/QLandmarkCategorySaveRequest
-%{_includedir}/QtLocation/QLandmarkCodec
-%{_includedir}/QtLocation/QLandmarkCodecPlugin
 %{_includedir}/QtLocation/QLandmarkExportRequest
 %{_includedir}/QtLocation/QLandmarkFetchByIdRequest
 %{_includedir}/QtLocation/QLandmarkFetchRequest
@@ -852,79 +792,7 @@
 %{_includedir}/QtLocation/QLandmarkSortOrder
 %{_includedir}/QtLocation/QLandmarkUnionFilter
 %{_includedir}/QtLocation/QNmeaPositionInfoSource
-%{_includedir}/QtLocation/qgeoaddress.h
-%{_includedir}/QtLocation/qgeoareamonitor.h
-%{_includedir}/QtLocation/qgeoboundingarea.h
-%{_includedir}/QtLocation/qgeoboundingbox.h
-%{_includedir}/QtLocation/qgeoboundingcircle.h
-%{_includedir}/QtLocation/qgeocoordinate.h
-%{_includedir}/QtLocation/qgeoinstruction.h
-%{_includedir}/QtLocation/qgeomapcircleobject.h
-%{_includedir}/QtLocation/qgeomapdata.h
-%{_includedir}/QtLocation/qgeomapobject.h
-%{_includedir}/QtLocation/qgeomapobjectinfo.h
-%{_includedir}/QtLocation/qgeomapoverlay.h
-%{_includedir}/QtLocation/qgeomappingmanager.h
-%{_includedir}/QtLocation/qgeomappingmanagerengine.h
-%{_includedir}/QtLocation/qgeomappixmapobject.h
-%{_includedir}/QtLocation/qgeomappolygonobject.h
-%{_includedir}/QtLocation/qgeomappolylineobject.h
-%{_includedir}/QtLocation/qgeomaprectangleobject.h
-%{_includedir}/QtLocation/qgeomaprouteobject.h
-%{_includedir}/QtLocation/qgeomaptextobject.h
-%{_includedir}/QtLocation/qgeoplace.h
-%{_includedir}/QtLocation/qgeopositioninfo.h
-%{_includedir}/QtLocation/qgeopositioninfosource.h
-%{_includedir}/QtLocation/qgeoroute.h
-%{_includedir}/QtLocation/qgeoroutereply.h
-%{_includedir}/QtLocation/qgeorouterequest.h
-%{_includedir}/QtLocation/qgeoroutesegment.h
-%{_includedir}/QtLocation/qgeoroutingmanager.h
-%{_includedir}/QtLocation/qgeoroutingmanagerengine.h
-%{_includedir}/QtLocation/qgeosatelliteinfo.h
-%{_includedir}/QtLocation/qgeosatelliteinfosource.h
-%{_includedir}/QtLocation/qgeosearchmanager.h
-%{_includedir}/QtLocation/qgeosearchmanagerengine.h
-%{_includedir}/QtLocation/qgeosearchreply.h
-%{_includedir}/QtLocation/qgeoserviceprovider.h
-%{_includedir}/QtLocation/qgeoserviceproviderfactory.h
-%{_includedir}/QtLocation/qgeotiledmapdata.h
-%{_includedir}/QtLocation/qgeotiledmappingmanagerengine.h
-%{_includedir}/QtLocation/qgeotiledmapreply.h
-%{_includedir}/QtLocation/qgeotiledmaprequest.h
-%{_includedir}/QtLocation/qgraphicsgeomap.h
-%{_includedir}/QtLocation/qlandmark.h
-%{_includedir}/QtLocation/qlandmarkabstractrequest.h
-%{_includedir}/QtLocation/qlandmarkattributefilter.h
-%{_includedir}/QtLocation/qlandmarkboxfilter.h
-%{_includedir}/QtLocation/qlandmarkcategory.h
-%{_includedir}/QtLocation/qlandmarkcategoryfetchbyidrequest.h
-%{_includedir}/QtLocation/qlandmarkcategoryfetchrequest.h
-%{_includedir}/QtLocation/qlandmarkcategoryfilter.h
-%{_includedir}/QtLocation/qlandmarkcategoryid.h
-%{_includedir}/QtLocation/qlandmarkcategoryidfetchrequest.h
-%{_includedir}/QtLocation/qlandmarkcategoryremoverequest.h
-%{_includedir}/QtLocation/qlandmarkcategorysaverequest.h
-%{_includedir}/QtLocation/qlandmarkexportrequest.h
-%{_includedir}/QtLocation/qlandmarkfetchbyidrequest.h
-%{_includedir}/QtLocation/qlandmarkfetchrequest.h
-%{_includedir}/QtLocation/qlandmarkfilter.h
-%{_includedir}/QtLocation/qlandmarkid.h
-%{_includedir}/QtLocation/qlandmarkidfetchrequest.h
-%{_includedir}/QtLocation/qlandmarkidfilter.h
-%{_includedir}/QtLocation/qlandmarkimportrequest.h
-%{_includedir}/QtLocation/qlandmarkintersectionfilter.h
-%{_includedir}/QtLocation/qlandmarkmanager.h
-%{_includedir}/QtLocation/qlandmarkmanagerengine.h
-%{_includedir}/QtLocation/qlandmarkmanagerenginefactory.h
-%{_includedir}/QtLocation/qlandmarknamefilter.h
-%{_includedir}/QtLocation/qlandmarknamesort.h
-%{_includedir}/QtLocation/qlandmarkproximityfilter.h
-%{_includedir}/QtLocation/qlandmarkremoverequest.h
-%{_includedir}/QtLocation/qlandmarksaverequest.h
-%{_includedir}/QtLocation/qlandmarksortorder.h
-%{_includedir}/QtLocation/qlandmarkunionfilter.h
-%{_includedir}/QtLocation/qnmeapositioninfosource.h
+%{_includedir}/QtMessaging/*.h
 %{_includedir}/QtMessaging/QMessage
 %{_includedir}/QtMessaging/QMessageAccount
 %{_includedir}/QtMessaging/QMessageAccountFilter
@@ -944,28 +812,9 @@
 %{_includedir}/QtMessaging/QMessageService
 %{_includedir}/QtMessaging/QMessageSortOrder
 %{_includedir}/QtMessaging/QMessageStore
-%{_includedir}/QtMessaging/qmessage.h
-%{_includedir}/QtMessaging/qmessageaccount.h
-%{_includedir}/QtMessaging/qmessageaccountfilter.h
-%{_includedir}/QtMessaging/qmessageaccountid.h
-%{_includedir}/QtMessaging/qmessageaccountsortorder.h
-%{_includedir}/QtMessaging/qmessageaddress.h
-%{_includedir}/QtMessaging/qmessagecontentcontainer.h
-%{_includedir}/QtMessaging/qmessagecontentcontainerid.h
-%{_includedir}/QtMessaging/qmessagedatacomparator.h
-%{_includedir}/QtMessaging/qmessagefilter.h
-%{_includedir}/QtMessaging/qmessagefolder.h
-%{_includedir}/QtMessaging/qmessagefolderfilter.h
-%{_includedir}/QtMessaging/qmessagefolderid.h
-%{_includedir}/QtMessaging/qmessagefoldersortorder.h
-%{_includedir}/QtMessaging/qmessageglobal.h
-%{_includedir}/QtMessaging/qmessageid.h
-%{_includedir}/QtMessaging/qmessagemanager.h
-%{_includedir}/QtMessaging/qmessageservice.h
-%{_includedir}/QtMessaging/qmessagesortorder.h
+%{_includedir}/QtMobility/*.h
 %{_includedir}/QtMobility/QLatin1Constant
-%{_includedir}/QtMobility/qlatin1constant.h
-%{_includedir}/QtMobility/qmobilityglobal.h
+%{_includedir}/QtMultimediaKit/*.h
 %{_includedir}/QtMultimediaKit/QAbstractAudioDeviceInfo
 %{_includedir}/QtMultimediaKit/QAbstractAudioInput
 %{_includedir}/QtMultimediaKit/QAbstractAudioOutput
@@ -1038,92 +887,24 @@
 %{_includedir}/QtMultimediaKit/QVideoWidget
 %{_includedir}/QtMultimediaKit/QVideoWidgetControl
 %{_includedir}/QtMultimediaKit/QVideoWindowControl
-%{_includedir}/QtMultimediaKit/qabstractvideobuffer.h
-%{_includedir}/QtMultimediaKit/qabstractvideobuffer_p.h
-%{_includedir}/QtMultimediaKit/qabstractvideosurface.h
-%{_includedir}/QtMultimediaKit/qabstractvideosurface_p.h
-%{_includedir}/QtMultimediaKit/qaudio.h
-%{_includedir}/QtMultimediaKit/qaudiocapturesource.h
-%{_includedir}/QtMultimediaKit/qaudiodeviceinfo.h
-%{_includedir}/QtMultimediaKit/qaudioencodercontrol.h
-%{_includedir}/QtMultimediaKit/qaudioendpointselector.h
-%{_includedir}/QtMultimediaKit/qaudioformat.h
-%{_includedir}/QtMultimediaKit/qaudioinput.h
-%{_includedir}/QtMultimediaKit/qaudiooutput.h
-%{_includedir}/QtMultimediaKit/qaudiosystem.h
-%{_includedir}/QtMultimediaKit/qaudiosystemplugin.h
-%{_includedir}/QtMultimediaKit/qcamera.h
-%{_includedir}/QtMultimediaKit/qcameracontrol.h
-%{_includedir}/QtMultimediaKit/qcameraexposure.h
-%{_includedir}/QtMultimediaKit/qcameraexposurecontrol.h
-%{_includedir}/QtMultimediaKit/qcameraflashcontrol.h
-%{_includedir}/QtMultimediaKit/qcamerafocus.h
-%{_includedir}/QtMultimediaKit/qcamerafocuscontrol.h
-%{_includedir}/QtMultimediaKit/qcameraimagecapture.h
-%{_includedir}/QtMultimediaKit/qcameraimagecapturecontrol.h
-%{_includedir}/QtMultimediaKit/qcameraimageprocessing.h
-%{_includedir}/QtMultimediaKit/qcameraimageprocessingcontrol.h
-%{_includedir}/QtMultimediaKit/qcameralockscontrol.h
-%{_includedir}/QtMultimediaKit/qcameraviewfinder.h
-%{_includedir}/QtMultimediaKit/qgraphicsvideoitem.h
-%{_includedir}/QtMultimediaKit/qimageencodercontrol.h
-%{_includedir}/QtMultimediaKit/qimagevideobuffer_p.h
-%{_includedir}/QtMultimediaKit/qlocalmediaplaylistprovider.h
-%{_includedir}/QtMultimediaKit/qmediabindableinterface.h
-%{_includedir}/QtMultimediaKit/qmediacontainercontrol.h
-%{_includedir}/QtMultimediaKit/qmediacontent.h
-%{_includedir}/QtMultimediaKit/qmediacontrol.h
-%{_includedir}/QtMultimediaKit/qmediaencodersettings.h
-%{_includedir}/QtMultimediaKit/qmediaimageviewer.h
-%{_includedir}/QtMultimediaKit/qmediaobject.h
-%{_includedir}/QtMultimediaKit/qmediaplayer.h
-%{_includedir}/QtMultimediaKit/qmediaplayercontrol.h
-%{_includedir}/QtMultimediaKit/qmediaplaylist.h
-%{_includedir}/QtMultimediaKit/qmediaplaylistcontrol.h
-%{_includedir}/QtMultimediaKit/qmediaplaylistioplugin.h
-%{_includedir}/QtMultimediaKit/qmediaplaylistnavigator.h
-%{_includedir}/QtMultimediaKit/qmediaplaylistprovider.h
-%{_includedir}/QtMultimediaKit/qmediaplaylistsourcecontrol.h
-%{_includedir}/QtMultimediaKit/qmediarecorder.h
-%{_includedir}/QtMultimediaKit/qmediarecordercontrol.h
-%{_includedir}/QtMultimediaKit/qmediaresource.h
-%{_includedir}/QtMultimediaKit/qmediaservice.h
-%{_includedir}/QtMultimediaKit/qmediaserviceprovider.h
-%{_includedir}/QtMultimediaKit/qmediaserviceproviderplugin.h
-%{_includedir}/QtMultimediaKit/qmediastreamscontrol.h
-%{_includedir}/QtMultimediaKit/qmediatimerange.h
-%{_includedir}/QtMultimediaKit/qmemoryvideobuffer_p.h
-%{_includedir}/QtMultimediaKit/qmetadatareadercontrol.h
-%{_includedir}/QtMultimediaKit/qmetadatawritercontrol.h
-%{_includedir}/QtMultimediaKit/qradiotuner.h
-%{_includedir}/QtMultimediaKit/qradiotunercontrol.h
-%{_includedir}/QtMultimediaKit/qsoundeffect.h
-%{_includedir}/QtMultimediaKit/qtmedianamespace.h
-%{_includedir}/QtMultimediaKit/qvideodevicecontrol.h
-%{_includedir}/QtMultimediaKit/qvideoencodercontrol.h
-%{_includedir}/QtMultimediaKit/qvideoframe.h
-%{_includedir}/QtMultimediaKit/qvideorenderercontrol.h
-%{_includedir}/QtMultimediaKit/qvideosurfaceformat.h
-%{_includedir}/QtMultimediaKit/qvideowidget.h
-%{_includedir}/QtMultimediaKit/qvideowidgetcontrol.h
-%{_includedir}/QtMultimediaKit/qvideowindowcontrol.h
+%{_includedir}/QtOrganizer/*.h
+%{_includedir}/QtOrganizer/QOrganizerAbstractRequest
 %{_includedir}/QtOrganizer/QOrganizerCollection
+%{_includedir}/QtOrganizer/QOrganizerCollectionChangeSet
+%{_includedir}/QtOrganizer/QOrganizerCollectionEngineId
 %{_includedir}/QtOrganizer/QOrganizerCollectionFetchRequest
 %{_includedir}/QtOrganizer/QOrganizerCollectionId
-%{_includedir}/QtOrganizer/QOrganizerCollectionLocalIdFetchRequest
 %{_includedir}/QtOrganizer/QOrganizerCollectionRemoveRequest
 %{_includedir}/QtOrganizer/QOrganizerCollectionSaveRequest
 %{_includedir}/QtOrganizer/QOrganizerEvent
 %{_includedir}/QtOrganizer/QOrganizerEventOccurrence
-%{_includedir}/QtOrganizer/QOrganizerEventTimeRange
+%{_includedir}/QtOrganizer/QOrganizerEventTime
 %{_includedir}/QtOrganizer/QOrganizerItem
-%{_includedir}/QtOrganizer/QOrganizerItemAbstractRequest
 %{_includedir}/QtOrganizer/QOrganizerItemAudibleReminder
 %{_includedir}/QtOrganizer/QOrganizerItemChangeLogFilter
 %{_includedir}/QtOrganizer/QOrganizerItemChangeSet
 %{_includedir}/QtOrganizer/QOrganizerItemCollectionFilter
 %{_includedir}/QtOrganizer/QOrganizerItemComment
-%{_includedir}/QtOrganizer/QOrganizerItemDateTimePeriodFilter
 %{_includedir}/QtOrganizer/QOrganizerItemDescription
 %{_includedir}/QtOrganizer/QOrganizerItemDetail
 %{_includedir}/QtOrganizer/QOrganizerItemDetailDefinition
@@ -1135,112 +916,48 @@
 %{_includedir}/QtOrganizer/QOrganizerItemDetailRangeFilter
 %{_includedir}/QtOrganizer/QOrganizerItemDisplayLabel
 %{_includedir}/QtOrganizer/QOrganizerItemEmailReminder
+%{_includedir}/QtOrganizer/QOrganizerItemEngineId
+%{_includedir}/QtOrganizer/QOrganizerItemFetchForExportRequest
 %{_includedir}/QtOrganizer/QOrganizerItemFetchHint
 %{_includedir}/QtOrganizer/QOrganizerItemFetchRequest
 %{_includedir}/QtOrganizer/QOrganizerItemFilter
 %{_includedir}/QtOrganizer/QOrganizerItemGuid
 %{_includedir}/QtOrganizer/QOrganizerItemId
-%{_includedir}/QtOrganizer/QOrganizerItemInstanceFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerItemInstanceOrigin
+%{_includedir}/QtOrganizer/QOrganizerItemIdFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerItemIdFilter
 %{_includedir}/QtOrganizer/QOrganizerItemIntersectionFilter
 %{_includedir}/QtOrganizer/QOrganizerItemInvalidFilter
-%{_includedir}/QtOrganizer/QOrganizerItemLocalIdFetchRequest
-%{_includedir}/QtOrganizer/QOrganizerItemLocalIdFilter
 %{_includedir}/QtOrganizer/QOrganizerItemLocation
-%{_includedir}/QtOrganizer/QOrganizerItemManager
-%{_includedir}/QtOrganizer/QOrganizerItemManagerEngine
-%{_includedir}/QtOrganizer/QOrganizerItemManagerEngineFactory
+%{_includedir}/QtOrganizer/QOrganizerItemOccurrenceFetchRequest
+%{_includedir}/QtOrganizer/QOrganizerItemParent
 %{_includedir}/QtOrganizer/QOrganizerItemPriority
 %{_includedir}/QtOrganizer/QOrganizerItemRecurrence
-%{_includedir}/QtOrganizer/QOrganizerItemRecurrenceRule
 %{_includedir}/QtOrganizer/QOrganizerItemReminder
 %{_includedir}/QtOrganizer/QOrganizerItemRemoveRequest
 %{_includedir}/QtOrganizer/QOrganizerItemSaveRequest
 %{_includedir}/QtOrganizer/QOrganizerItemSortOrder
+%{_includedir}/QtOrganizer/QOrganizerItemTag
 %{_includedir}/QtOrganizer/QOrganizerItemTimestamp
 %{_includedir}/QtOrganizer/QOrganizerItemType
 %{_includedir}/QtOrganizer/QOrganizerItemUnionFilter
 %{_includedir}/QtOrganizer/QOrganizerItemVisualReminder
 %{_includedir}/QtOrganizer/QOrganizerJournal
-%{_includedir}/QtOrganizer/QOrganizerJournalTimeRange
+%{_includedir}/QtOrganizer/QOrganizerJournalTime
+%{_includedir}/QtOrganizer/QOrganizerManager
+%{_includedir}/QtOrganizer/QOrganizerManagerEngine
+%{_includedir}/QtOrganizer/QOrganizerManagerEngineFactory
 %{_includedir}/QtOrganizer/QOrganizerNote
+%{_includedir}/QtOrganizer/QOrganizerRecurrenceRule
 %{_includedir}/QtOrganizer/QOrganizerTodo
 %{_includedir}/QtOrganizer/QOrganizerTodoOccurrence
 %{_includedir}/QtOrganizer/QOrganizerTodoProgress
-%{_includedir}/QtOrganizer/QOrganizerTodoTimeRange
-%{_includedir}/QtOrganizer/qorganizercollection.h
-%{_includedir}/QtOrganizer/qorganizercollectionfetchrequest.h
-%{_includedir}/QtOrganizer/qorganizercollectionid.h
-%{_includedir}/QtOrganizer/qorganizercollectionlocalidfetchrequest.h
-%{_includedir}/QtOrganizer/qorganizercollectionremoverequest.h
-%{_includedir}/QtOrganizer/qorganizercollectionsaverequest.h
-%{_includedir}/QtOrganizer/qorganizerevent.h
-%{_includedir}/QtOrganizer/qorganizereventoccurrence.h
-%{_includedir}/QtOrganizer/qorganizereventtimerange.h
-%{_includedir}/QtOrganizer/qorganizeritem.h
-%{_includedir}/QtOrganizer/qorganizeritemabstractrequest.h
-%{_includedir}/QtOrganizer/qorganizeritemaudiblereminder.h
-%{_includedir}/QtOrganizer/qorganizeritemchangelogfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemchangeset.h
-%{_includedir}/QtOrganizer/qorganizeritemcollectionfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemcomment.h
-%{_includedir}/QtOrganizer/qorganizeritemdatetimeperiodfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemdescription.h
-%{_includedir}/QtOrganizer/qorganizeritemdetail.h
-%{_includedir}/QtOrganizer/qorganizeritemdetaildefinition.h
-%{_includedir}/QtOrganizer/qorganizeritemdetaildefinitionfetchrequest.h
-%{_includedir}/QtOrganizer/qorganizeritemdetaildefinitionremoverequest.h
-%{_includedir}/QtOrganizer/qorganizeritemdetaildefinitionsaverequest.h
-%{_includedir}/QtOrganizer/qorganizeritemdetailfielddefinition.h
-%{_includedir}/QtOrganizer/qorganizeritemdetailfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemdetailrangefilter.h
-%{_includedir}/QtOrganizer/qorganizeritemdetails.h
-%{_includedir}/QtOrganizer/qorganizeritemdisplaylabel.h
-%{_includedir}/QtOrganizer/qorganizeritememailreminder.h
-%{_includedir}/QtOrganizer/qorganizeritemfetchhint.h
-%{_includedir}/QtOrganizer/qorganizeritemfetchrequest.h
-%{_includedir}/QtOrganizer/qorganizeritemfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemfilters.h
-%{_includedir}/QtOrganizer/qorganizeritemguid.h
-%{_includedir}/QtOrganizer/qorganizeritemid.h
-%{_includedir}/QtOrganizer/qorganizeriteminstancefetchrequest.h
-%{_includedir}/QtOrganizer/qorganizeriteminstanceorigin.h
-%{_includedir}/QtOrganizer/qorganizeritemintersectionfilter.h
-%{_includedir}/QtOrganizer/qorganizeriteminvalidfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemlocalidfetchrequest.h
-%{_includedir}/QtOrganizer/qorganizeritemlocalidfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemlocation.h
-%{_includedir}/QtOrganizer/qorganizeritemmanager.h
-%{_includedir}/QtOrganizer/qorganizeritemmanagerengine.h
-%{_includedir}/QtOrganizer/qorganizeritemmanagerenginefactory.h
-%{_includedir}/QtOrganizer/qorganizeritempriority.h
-%{_includedir}/QtOrganizer/qorganizeritemrecurrence.h
-%{_includedir}/QtOrganizer/qorganizeritemrecurrencerule.h
-%{_includedir}/QtOrganizer/qorganizeritemreminder.h
-%{_includedir}/QtOrganizer/qorganizeritemremoverequest.h
-%{_includedir}/QtOrganizer/qorganizeritemrequests.h
-%{_includedir}/QtOrganizer/qorganizeritems.h
-%{_includedir}/QtOrganizer/qorganizeritemsaverequest.h
-%{_includedir}/QtOrganizer/qorganizeritemsortorder.h
-%{_includedir}/QtOrganizer/qorganizeritemtimestamp.h
-%{_includedir}/QtOrganizer/qorganizeritemtype.h
-%{_includedir}/QtOrganizer/qorganizeritemunionfilter.h
-%{_includedir}/QtOrganizer/qorganizeritemvisualreminder.h
-%{_includedir}/QtOrganizer/qorganizerjournal.h
-%{_includedir}/QtOrganizer/qorganizerjournaltimerange.h
-%{_includedir}/QtOrganizer/qorganizernote.h
-%{_includedir}/QtOrganizer/qorganizertodo.h
-%{_includedir}/QtOrganizer/qorganizertodooccurrence.h
-%{_includedir}/QtOrganizer/qorganizertodoprogress.h
-%{_includedir}/QtOrganizer/qorganizertodotimerange.h
-%{_includedir}/QtOrganizer/qtorganizer.h
-%{_includedir}/QtOrganizer/qtorganizerglobal.h
+%{_includedir}/QtOrganizer/QOrganizerTodoTime
+%{_includedir}/QtPublishSubscribe/*.h
 %{_includedir}/QtPublishSubscribe/QValueSpace
 %{_includedir}/QtPublishSubscribe/QValueSpacePublisher
 %{_includedir}/QtPublishSubscribe/QValueSpaceSubscriber
-%{_includedir}/QtPublishSubscribe/qvaluespace.h
-%{_includedir}/QtPublishSubscribe/qvaluespacepublisher.h
-%{_includedir}/QtPublishSubscribe/qvaluespacesubscriber.h
+%{_includedir}/QtSensors/*.h
+%{_includedir}/QtSensors/qtimestamp
 %{_includedir}/QtSensors/QAccelerometer
 %{_includedir}/QtSensors/QAccelerometerFilter
 %{_includedir}/QtSensors/QAccelerometerReading
@@ -1272,50 +989,24 @@
 %{_includedir}/QtSensors/QTapFilter
 %{_includedir}/QtSensors/QTapReading
 %{_includedir}/QtSensors/QTapSensor
-%{_includedir}/QtSensors/qaccelerometer.h
-%{_includedir}/QtSensors/qambientlightsensor.h
-%{_includedir}/QtSensors/qcompass.h
-%{_includedir}/QtSensors/qmagnetometer.h
-%{_includedir}/QtSensors/qorientationsensor.h
-%{_includedir}/QtSensors/qproximitysensor.h
-%{_includedir}/QtSensors/qrotationsensor.h
-%{_includedir}/QtSensors/qsensor.h
-%{_includedir}/QtSensors/qsensorbackend.h
-%{_includedir}/QtSensors/qsensormanager.h
-%{_includedir}/QtSensors/qsensorplugin.h
-%{_includedir}/QtSensors/qtapsensor.h
-%{_includedir}/QtSensors/qtimestamp
+%{_includedir}/QtServiceFramework/*.h
+%{_includedir}/QtServiceFramework/Entry
 %{_includedir}/QtServiceFramework/QAbstractSecuritySession
-%{_includedir}/QtServiceFramework/QRemoteServiceClassRegister
-%{_includedir}/QtServiceFramework/QRemoteServiceControl
+%{_includedir}/QtServiceFramework/QRemoteServiceRegister
 %{_includedir}/QtServiceFramework/QService
 %{_includedir}/QtServiceFramework/QServiceContext
 %{_includedir}/QtServiceFramework/QServiceFilter
 %{_includedir}/QtServiceFramework/QServiceInterfaceDescriptor
 %{_includedir}/QtServiceFramework/QServiceManager
 %{_includedir}/QtServiceFramework/QServicePluginInterface
-%{_includedir}/QtServiceFramework/qabstractsecuritysession.h
-%{_includedir}/QtServiceFramework/qremoteserviceclassregister.h
-%{_includedir}/QtServiceFramework/qremoteservicecontrol.h
-%{_includedir}/QtServiceFramework/qservice.h
-%{_includedir}/QtServiceFramework/qservicecontext.h
-%{_includedir}/QtServiceFramework/qservicefilter.h
-%{_includedir}/QtServiceFramework/qserviceinterfacedescriptor.h
-%{_includedir}/QtServiceFramework/qservicemanager.h
-%{_includedir}/QtServiceFramework/qserviceplugininterface.h
+%{_includedir}/QtSystemInfo/*.h
 %{_includedir}/QtSystemInfo/QSystemDeviceInfo
 %{_includedir}/QtSystemInfo/QSystemDisplayInfo
 %{_includedir}/QtSystemInfo/QSystemInfo
 %{_includedir}/QtSystemInfo/QSystemNetworkInfo
 %{_includedir}/QtSystemInfo/QSystemScreenSaver
 %{_includedir}/QtSystemInfo/QSystemStorageInfo
-%{_includedir}/QtSystemInfo/qsystemdeviceinfo.h
-%{_includedir}/QtSystemInfo/qsystemdisplayinfo.h
-%{_includedir}/QtSystemInfo/qsystemgeneralinfo.h
-%{_includedir}/QtSystemInfo/qsysteminfo.h
-%{_includedir}/QtSystemInfo/qsystemnetworkinfo.h
-%{_includedir}/QtSystemInfo/qsystemscreensaver.h
-%{_includedir}/QtSystemInfo/qsystemstorageinfo.h
+%{_includedir}/QtVersit/*.h
 %{_includedir}/QtVersit/QVersitContactExporter
 %{_includedir}/QtVersit/QVersitContactExporterDetailHandler
 %{_includedir}/QtVersit/QVersitContactExporterDetailHandlerV2
@@ -1330,14 +1021,7 @@
 %{_includedir}/QtVersit/QVersitReader
 %{_includedir}/QtVersit/QVersitResourceHandler
 %{_includedir}/QtVersit/QVersitWriter
-%{_includedir}/QtVersit/qversitcontactexporter.h
-%{_includedir}/QtVersit/qversitcontacthandler.h
-%{_includedir}/QtVersit/qversitcontactimporter.h
-%{_includedir}/QtVersit/qversitdocument.h
-%{_includedir}/QtVersit/qversitproperty.h
-%{_includedir}/QtVersit/qversitreader.h
-%{_includedir}/QtVersit/qversitresourcehandler.h
-%{_includedir}/QtVersit/qversitwriter.h
+%{_includedir}/QtVersitOrganizer/*.h
 %{_includedir}/QtVersitOrganizer/QVersitOrganizerExporter
 %{_includedir}/QtVersitOrganizer/QVersitOrganizerExporterDetailHandler
 %{_includedir}/QtVersitOrganizer/QVersitOrganizerHandler
@@ -1345,10 +1029,6 @@
 %{_includedir}/QtVersitOrganizer/QVersitOrganizerImporter
 %{_includedir}/QtVersitOrganizer/QVersitOrganizerImporterPropertyHandler
 %{_includedir}/QtVersitOrganizer/QVersitTimeZoneHandler
-%{_includedir}/QtVersitOrganizer/qversitorganizerexporter.h
-%{_includedir}/QtVersitOrganizer/qversitorganizerhandler.h
-%{_includedir}/QtVersitOrganizer/qversitorganizerimporter.h
-%{_includedir}/QtVersitOrganizer/qversittimezonehandler.h
 %{_libdir}/libQtContacts.prl
 %{_libdir}/libQtContacts.so
 %{_libdir}/libQtFeedback.prl
@@ -1478,6 +1158,13 @@
 %{_libdir}/qt4/imports/QtMobility/contacts/qmldir
 # << files libdeclarative-contacts
 
+%files -n libdeclarative-feedback
+%defattr(-,root,root,-)
+# >> files libdeclarative-feedback
+%{_libdir}/qt4/imports/QtMobility/feedback/libdeclarative_feedback.so
+%{_libdir}/qt4/imports/QtMobility/feedback/qmldir
+# << files libdeclarative-feedback
+
 %files -n libdeclarative-gallery
 %defattr(-,root,root,-)
 # >> files libdeclarative-gallery
@@ -1502,10 +1189,17 @@
 %files -n libdeclarative-multimedia
 %defattr(-,root,root,-)
 # >> files libdeclarative-multimedia
-%{_libdir}/qt4/imports/Qt/multimedia/libdeclarative_multimedia.so
-%{_libdir}/qt4/imports/Qt/multimedia/qmldir
+%{_libdir}/qt4/imports/QtMultimediaKit/libdeclarative_multimedia.so
+%{_libdir}/qt4/imports/QtMultimediaKit/qmldir
 # << files libdeclarative-multimedia
 
+%files -n libdeclarative-organizer
+%defattr(-,root,root,-)
+# >> files libdeclarative-organizer
+%{_libdir}/qt4/imports/QtMobility/organizer/libdeclarative_organizer.so
+%{_libdir}/qt4/imports/QtMobility/organizer/qmldir
+# << files libdeclarative-organizer
+
 %files -n libdeclarative-publishsubscribe
 %defattr(-,root,root,-)
 # >> files libdeclarative-publishsubscribe
@@ -1549,98 +1243,8 @@
 %{_libdir}/qt4/plugins/serviceframework/libserviceframework_landlinedialerservice.so
 %{_libdir}/qt4/plugins/serviceframework/libserviceframework_notesmanagerplugin.so
 %{_libdir}/qt4/plugins/serviceframework/libserviceframework_voipdialerservice.so
-%{_libdir}/qtmobility/demos/player
-%{_libdir}/qtmobility/demos/qmlcontacts/contacts.qml
-%{_libdir}/qtmobility/demos/qmlcontacts/contents/MediaButton.qml
-%{_libdir}/qtmobility/demos/qmlcontacts/contents/ScrollBar.qml
-%{_libdir}/qtmobility/demos/qmlcontacts/contents/default.svg
-%{_libdir}/qtmobility/demos/qmlcontacts/contents/example.vcf
-%{_libdir}/qtmobility/demos/qmlcontacts/contents/pics/button-pressed.png
-%{_libdir}/qtmobility/demos/qmlcontacts/contents/pics/button.png
-%{_libdir}/qtmobility/demos/qmlcontacts/qmlcontacts.qmlproject
-%{_libdir}/qtmobility/demos/serviceactions
-%{_libdir}/qtmobility/demos/smallsensors
-%{_libdir}/qtmobility/examples/GeoServiceDemo
-%{_libdir}/qtmobility/examples/MapViewer
-%{_libdir}/qtmobility/examples/accel
-%{_libdir}/qtmobility/examples/arrowkeys
-%{_libdir}/qtmobility/examples/audiodevices
-%{_libdir}/qtmobility/examples/audioinput
-%{_libdir}/qtmobility/examples/audiooutput
-%{_libdir}/qtmobility/examples/audiorecorder
-%{_libdir}/qtmobility/examples/battery-publisher
-%{_libdir}/qtmobility/examples/battery-subscriber/battery-subscriber.qml
-%{_libdir}/qtmobility/examples/battery-subscriber/content/bubble.png
-%{_libdir}/qtmobility/examples/calendardemo
-%{_libdir}/qtmobility/examples/camera
-%{_libdir}/qtmobility/examples/cubehouse
-%{_libdir}/qtmobility/examples/declarative-music-browser
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/README
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/DialButton.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/DialScreen.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/DialerList.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/call.png
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/hangup.png
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/content/qmldir
-%{_libdir}/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/README
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/Button.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/Dialog.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/InputDialog.qml
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/addIcon.png
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/deleteIcon.png
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/nextIcon.png
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/prevIcon.png
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/icons/searchIcon.png
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/content/qmldir
-%{_libdir}/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.qml
-%{_libdir}/qtmobility/examples/documentproperties
-%{_libdir}/qtmobility/examples/grueapp
-%{_libdir}/qtmobility/examples/hapticsplayer
-%{_libdir}/qtmobility/examples/hapticsquare
-%{_libdir}/qtmobility/examples/keepintouch
-%{_libdir}/qtmobility/examples/landmarkbrowser
-%{_libdir}/qtmobility/examples/logfilepositionsource
-%{_libdir}/qtmobility/examples/mediabrowser
-%{_libdir}/qtmobility/examples/metadata
-%{_libdir}/qtmobility/examples/metadata2
-%{_libdir}/qtmobility/examples/moreplaces.lmx
-%{_libdir}/qtmobility/examples/orientation
-%{_libdir}/qtmobility/examples/places.gpx
-%{_libdir}/qtmobility/examples/publish-subscribe
-%{_libdir}/qtmobility/examples/qml_landmarkmap
-%{_libdir}/qtmobility/examples/qml_location_flickr
-%{_libdir}/qtmobility/examples/qml_mapviewer
-%{_libdir}/qtmobility/examples/qsysinfo
-%{_libdir}/qtmobility/examples/querymessages
-%{_libdir}/qtmobility/examples/radio
-%{_libdir}/qtmobility/examples/reading_perf
-%{_libdir}/qtmobility/examples/samplephonebook
-%{_libdir}/qtmobility/examples/satellitedialog
-%{_libdir}/qtmobility/examples/sensor_explorer
-%{_libdir}/qtmobility/examples/servicebrowser
-%{_libdir}/qtmobility/examples/sfw-notes
-%{_libdir}/qtmobility/examples/sfwecho_client
-%{_libdir}/qtmobility/examples/sfwecho_service
-%{_libdir}/qtmobility/examples/show_acceleration
-%{_libdir}/qtmobility/examples/show_als
-%{_libdir}/qtmobility/examples/show_compass
-%{_libdir}/qtmobility/examples/show_magneticflux
-%{_libdir}/qtmobility/examples/show_orientation
-%{_libdir}/qtmobility/examples/show_proximity
-%{_libdir}/qtmobility/examples/show_rotation
-%{_libdir}/qtmobility/examples/show_tap
-%{_libdir}/qtmobility/examples/simplelog.txt
-%{_libdir}/qtmobility/examples/slideshow
-%{_libdir}/qtmobility/examples/videographicsitem
-%{_libdir}/qtmobility/examples/videowidget
-%{_libdir}/qtmobility/examples/writemessage
-%{_libdir}/qtmobility/examples/xmldata/bluetoothtransferservice.xml
-%{_libdir}/qtmobility/examples/xmldata/filemanagerservice.xml
-%{_libdir}/qtmobility/examples/xmldata/landlinedialerservice.xml
-%{_libdir}/qtmobility/examples/xmldata/notesmanagerservice.xml
-%{_libdir}/qtmobility/examples/xmldata/sfwechoservice.xml
-%{_libdir}/qtmobility/examples/xmldata/voipdialerservice.xml
+%{_libdir}/qtmobility/demos/
+%{_libdir}/qtmobility/examples/
 # << files examples
 
 %files l10n
@@ -1654,7 +1258,7 @@
 %{_datadir}/qtmobility/translations/qtmobility_fr.qm
 %{_datadir}/qtmobility/translations/qtmobility_he.qm
 %{_datadir}/qtmobility/translations/qtmobility_hu.qm
-%{_datadir}/qtmobility/translations/qtmobility_ja_JP.qm
+%{_datadir}/qtmobility/translations/qtmobility_ja.qm
 %{_datadir}/qtmobility/translations/qtmobility_pl.qm
 %{_datadir}/qtmobility/translations/qtmobility_pt.qm
 %{_datadir}/qtmobility/translations/qtmobility_ru.qm

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

++++++ GL_CLAMP_TO_EDGE_of_video_texture.patch
--- GL_CLAMP_TO_EDGE_of_video_texture.patch
+++ GL_CLAMP_TO_EDGE_of_video_texture.patch
@@ -2,7 +2,7 @@
 Author: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
 --- a/src/multimedia/qpaintervideosurface.cpp
 +++ b/src/multimedia/qpaintervideosurface.cpp
-@@ -362,8 +362,8 @@ QAbstractVideoSurface::Error QVideoSurfa
+@@ -356,8 +356,8 @@ QAbstractVideoSurface::Error QVideoSurfa
                      m_frame.bits() + m_textureOffsets[i]);
              glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
              glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

++++++ add_location_api_meego_implementation_using_geoclue.patch
--- add_location_api_meego_implementation_using_geoclue.patch
+++ add_location_api_meego_implementation_using_geoclue.patch
@@ -33,7 +33,7 @@
      CONFIG += qdbus link_pkgconfig
 --- a/src/location/qgeopositioninfosource.cpp
 +++ b/src/location/qgeopositioninfosource.cpp
-@@ -56,6 +56,8 @@
+@@ -50,6 +50,8 @@
  #   include "qgeopositioninfosource_maemo_p.h"
  #elif defined(Q_WS_MAEMO_5)
  #   include "qgeopositioninfosource_maemo5_p.h"
@@ -42,7 +42,7 @@
  #endif
  
  QTM_BEGIN_NAMESPACE
-@@ -227,9 +229,17 @@ QGeoPositionInfoSource *QGeoPositionInfo
+@@ -221,9 +223,17 @@ QGeoPositionInfoSource *QGeoPositionInfo
          delete source;
          return 0;
      }
@@ -280,7 +280,7 @@
 +#endif // QGEOPOSITIONINFOSOURCEMEEGO_H
 --- a/src/location/qgeosatelliteinfosource.cpp
 +++ b/src/location/qgeosatelliteinfosource.cpp
-@@ -56,6 +56,8 @@
+@@ -50,6 +50,8 @@
  #   include "qgeosatelliteinfosource_maemo_p.h"
  #elif defined(Q_WS_MAEMO_5)
  #   include "qgeosatelliteinfosource_maemo5_p.h"
@@ -289,7 +289,7 @@
  #endif
  
  QTM_BEGIN_NAMESPACE
-@@ -118,7 +120,16 @@ QGeoSatelliteInfoSource *QGeoSatelliteIn
+@@ -112,7 +114,16 @@ QGeoSatelliteInfoSource *QGeoSatelliteIn
      return source;
  #elif defined(QT_SIMULATOR)
      return new QGeoSatelliteInfoSourceSimulator(parent);

++++++ add_meego_build_flag.patch
--- add_meego_build_flag.patch
+++ add_meego_build_flag.patch
@@ -14,7 +14,7 @@
      contains(TEMPLATE,.*app.*): QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
 --- a/configure
 +++ b/configure
-@@ -155,6 +155,7 @@ usage()
+@@ -149,6 +149,7 @@ usage()
      echo "                    Modules should be separated by a space and surrounded"
      echo "                    by double quotation. If a selected module depends on other modules"
      echo "                    those modules (and their dependencies) will automatically be enabled."
@@ -22,7 +22,7 @@
      echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)."
      echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Fremantle)."
      echo "-sdk <sdk> ........ Build using Apple provided SDK <path/to/sdk>."
-@@ -231,6 +232,9 @@ while [ "$#" -gt 0 ]; do
+@@ -225,6 +226,9 @@ while [ "$#" -gt 0 ]; do
          -silent)
              BUILD_SILENT=yes
              ;;
@@ -32,7 +32,7 @@
          -maemo5)
              LINUX_TARGET=maemo5
              ;;
-@@ -347,6 +351,8 @@ if [ -n "$LINUX_TARGET" ]; then
+@@ -341,6 +345,8 @@ if [ -n "$LINUX_TARGET" ]; then
          echo "CONFIG+=maemo5" >> "$CONFIG_IN"
      elif [ "$LINUX_TARGET" = "maemo6" ]; then
          echo "CONFIG+=maemo6" >> "$CONFIG_IN"

++++++ enable_camerabin_with_meego_target.patch (new)
--- enable_camerabin_with_meego_target.patch
+++ enable_camerabin_with_meego_target.patch
+--- a/plugins/multimedia/gstreamer/camerabin/camerabinaudioencoder.cpp
++++ b/plugins/multimedia/gstreamer/camerabin/camerabinaudioencoder.cpp
+@@ -49,7 +49,7 @@ CameraBinAudioEncoder::CameraBinAudioEnc
+ {
+     QList<QByteArray> codecCandidates;
+ 
+-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
++#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
+     codecCandidates << "audio/AAC" << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/speex"
+                     << "audio/ADPCM" << "audio/iLBC" << "audio/vorbis" << "audio/mpeg" << "audio/FLAC";
+ 
+--- a/plugins/multimedia/gstreamer/camerabin/camerabinservice.cpp
++++ b/plugins/multimedia/gstreamer/camerabin/camerabinservice.cpp
+@@ -105,7 +105,7 @@ CameraBinService::CameraBinService(const
+ 
+         m_videoRenderer = new QGstreamerVideoRenderer(this);
+ 
+-#ifdef Q_WS_MAEMO_6
++#if defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
+         m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink");
+         //m_videoWindow = new QGstreamerVideoWindow(this);
+ #else
+--- a/plugins/multimedia/gstreamer/camerabin/camerabinvideoencoder.cpp
++++ b/plugins/multimedia/gstreamer/camerabin/camerabinvideoencoder.cpp
+@@ -49,7 +49,7 @@ CameraBinVideoEncoder::CameraBinVideoEnc
+     :QVideoEncoderControl(session), m_session(session)
+ {
+     QList<QByteArray> codecCandidates;
+-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
++#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
+     codecCandidates << "video/mpeg4" << "video/h264" << "video/h263" << "video/theora"
+                     << "video/mpeg2" << "video/mpeg1" << "video/mjpeg" << "video/VP8" << "video/h261";
+ 
+--- a/plugins/multimedia/gstreamer/gstreamer.pro
++++ b/plugins/multimedia/gstreamer/gstreamer.pro
+@@ -38,6 +38,10 @@ maemo* {
+   QT += dbus
+ }
+ 
++meego {
++  PKGCONFIG +=gstreamer-plugins-bad-free-0.10
++}
++
+ # Input
+ HEADERS += \
+     qgstreamermessage.h \

++++++ enable_pkgconfig_support.patch
--- enable_pkgconfig_support.patch
+++ enable_pkgconfig_support.patch
@@ -2,7 +2,7 @@
 Author: Fathi Boudra <fathi.boudra at nokia.com>
 --- a/src/contacts/contacts.pro
 +++ b/src/contacts/contacts.pro
-@@ -90,9 +90,16 @@ maemo6 {
+@@ -92,9 +92,16 @@ maemo6 {
      isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=tracker
  }
  
@@ -20,7 +20,7 @@
      pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
      pkgconfig.files = QtContacts.pc
  
-@@ -129,6 +136,3 @@ simulator {
+@@ -131,6 +138,3 @@ simulator {
  }
  
  !isEmpty(CONTACTS_DEFAULT_ENGINE): DEFINES += Q_CONTACTS_DEFAULT_ENGINE=$$CONTACTS_DEFAULT_ENGINE

++++++ enable_sensorfw_support.patch
--- enable_sensorfw_support.patch
+++ enable_sensorfw_support.patch
@@ -2,10 +2,10 @@
 Author: Kalle Lampila <kalle.lampila at cybercom.com>
 --- a/configure
 +++ b/configure
-@@ -560,7 +560,7 @@ compileTest "Maemo5 contacts dependencie
- compileTest "Maemo5 organizer dependencies" maemo5-calendar
+@@ -555,7 +555,7 @@ compileTest "Maemo5 organizer dependenci
  compileTest "Bluez" bluez
  compileTest "Gstreamer Photography" gstreamer-photography
+ compileTest "Pulse Audio" pulseaudio
 -if [ "$LINUX_TARGET" = maemo6 ]; then
 +if [ "$LINUX_TARGET" = maemo6 ] || [ "$LINUX_TARGET" = meego ]; then
      compileTest sensord sensord

++++++ enable_tracker_contacts_engine.patch
--- enable_tracker_contacts_engine.patch
+++ enable_tracker_contacts_engine.patch
@@ -1,6 +1,6 @@
 --- a/src/contacts/contacts.pro
 +++ b/src/contacts/contacts.pro
-@@ -86,7 +86,7 @@ maemo5 {
+@@ -88,7 +88,7 @@ maemo5 {
      isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=maemo5
  }
  

++++++ fix_bmc_8705.patch
--- fix_bmc_8705.patch
+++ fix_bmc_8705.patch
@@ -6,8 +6,6 @@
  plugins/sensors/maemo6/maemo6sensorbase.h |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
-diff --git a/plugins/sensors/maemo6/maemo6sensorbase.h b/plugins/sensors/maemo6/maemo6sensorbase.h
-index e8db27f..f1e196a 100644
 --- a/plugins/sensors/maemo6/maemo6sensorbase.h
 +++ b/plugins/sensors/maemo6/maemo6sensorbase.h
 @@ -77,6 +77,9 @@ protected:
@@ -20,6 +18,3 @@
  
          initDone = true;
  
--- 
-1.7.2.3
-

++++++ fix_translations_install_path.patch
--- fix_translations_install_path.patch
+++ fix_translations_install_path.patch
@@ -3,12 +3,20 @@
 Author: Fathi Boudra <fathi.boudra at nokia.com>
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
-@@ -42,7 +42,7 @@ isEmpty(vcproj) {
-     QMAKE_EXTRA_COMPILERS += phony_src
+@@ -2,7 +2,7 @@ include(../staticconfig.pri)
+ 
+ # most of this is shamelessly copied from Qt Creator
+ 
+-LANGUAGES =
++LANGUAGES = ar cs da de es fr he hu ja pl pt ru sk sl sv uk zh_CN zh_TW
+ 
+ LUPDATE_ARGS = \
+     -I../include \
+@@ -97,6 +97,6 @@ isEmpty(vcproj) {
  }
  
--translations.path = $${QT_MOBILITY_PREFIX}/translations
-+translations.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
- translations.files = $$TRANSLATIONS
- translations.files ~= s,\\.ts$,.qm,g
- translations.files ~= s,^,$$OUT_PWD/,g
+ qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtmobility_,.qm)
+-qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
++qmfiles.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
+ qmfiles.CONFIG += no_check_exist
+ INSTALLS += qmfiles

++++++ no_rpath.patch
--- no_rpath.patch
+++ no_rpath.patch
@@ -95,7 +95,7 @@
      videowidget.h \
 --- a/features/basic_examples_setup.pri
 +++ b/features/basic_examples_setup.pri
-@@ -24,7 +24,6 @@ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART
+@@ -36,7 +36,6 @@ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART
  OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
  mac:LIBS+= -F$$OUTPUT_DIR/lib
  LIBS+= -L$$OUTPUT_DIR/lib

++++++ qt-mobility-opensource-src-1.1.0-beta2.tar.gz -> qt-mobility-opensource-src-1.1.0.tar.gz
583817 lines of diff (skipped)

++++++ qt-mobility.yaml
--- qt-mobility.yaml
+++ qt-mobility.yaml
@@ -1,15 +1,14 @@
 Name: qt-mobility
 Summary: APIs for mobile device functionality
-Version: 1.1.0~beta2
+Version: 1.1.0
 Release: 1
 Group: System/Libraries
 License: LGPLv2.1 with exception or GPLv3
 URL: http://qt.gitorious.org/qt-mobility
 Sources:
-    - http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-1.1.0-beta2.tar.gz
+    - http://get.qt.nokia.com/qt/add-ons/%{name}-opensource-src-%{version}.tar.gz
 Patches:
     - no_rpath.patch
-    - ftbfs_multimedia_examples.patch
     - fix_translations_install_path.patch
     - GL_CLAMP_TO_EDGE_of_video_texture.patch
 #    - default_subtitle_loading.patch
@@ -19,9 +18,8 @@
     - enable_sensorfw_support.patch
     - add_location_api_meego_implementation_using_geoclue.patch
     - use_isabspath.patch
-    - qmf_2010w36_support.patch
     - fix_bmc_8705.patch
-    - gstreamer_mediacapture_backend_bmc9202.patch
+    - enable_camerabin_with_meego_target.patch
 Description: |
     Qt Mobility delivers a set of new APIs for mobile device functionality. These
     APIs allow the developer to use these features with ease from one framework and
@@ -48,12 +46,14 @@
     - contextsubscriber-1.0
     - gconf-2.0
     - geoclue
+    - gstreamer-plugins-bad-free-0.10
     - gstreamer-plugins-base-0.10
     - gypsy
     - libpulse
     - qttracker
     - qmfclient
     - sensord
+    - udev
     - x11
     - xext
     - xrandr
@@ -63,7 +63,7 @@
     - qt-devel-tools
 Configure: none
 Builder: none
-RunFdupes: "%{_includedir}"
+RunFdupes: "%{_datadir}/qtmobility/translations"
 SubPackages:
     - Name: devel
       Summary: APIs for mobile device functionality - development files
@@ -220,6 +220,15 @@
 
           This package contains the Contacts QML plugin for QtDeclarative.
 
+    - Name: libdeclarative-feedback
+      AsWholeName: yes
+      Summary: Qt Mobility Feedback QML plugin
+      Group: System/Libraries
+      Description: |
+          Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+          This package contains the Feedback QML plugin for QtDeclarative.
+
     - Name: libdeclarative-gallery
       AsWholeName: yes
       Summary: Qt Mobility Document Gallery QML plugin
@@ -256,6 +265,15 @@
 
           This package contains the Multimedia QML plugin for QtDeclarative.
 
+    - Name: libdeclarative-organizer
+      AsWholeName: yes
+      Summary: Qt Mobility Organizer QML plugin
+      Group: System/Libraries
+      Description: |
+          Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+          This package contains the Organizer QML plugin for QtDeclarative.
+
     - Name: libdeclarative-publishsubscribe
       AsWholeName: yes
       Summary: Qt Mobility Publish and Subscribe QML plugin

++++++ use_isabspath.patch
--- use_isabspath.patch
+++ use_isabspath.patch
@@ -3,7 +3,7 @@
 Author: Fathi Boudra <fathi.boudra at nokia.com>
 --- a/configure
 +++ b/configure
-@@ -64,7 +64,7 @@ isAbsPath() {
+@@ -58,7 +58,7 @@ isAbsPath() {
  # maemo we do not want to follow symbolic links that are
  # introduced by scratchbox
  absPath() {

++++++ deleted files:
--- ftbfs_multimedia_examples.patch
--- gstreamer_mediacapture_backend_bmc9202.patch
--- qmf_2010w36_support.patch

More information about the MeeGo-commits mailing list