[meego-commits] 6541: Changes to Trunk/qt-mobility
Anas Nashif
nashif at linux.intel.com
Thu Aug 12 22:37:38 UTC 2010
Hi,
I have made the following changes to qt-mobility in project Trunk. Please review and accept ASAP.
Thank You,
Anas Nashif
[This message was auto-generated]
---
Request #6541:
submit: Trunk:Testing/qt-mobility(r2) -> Trunk/qt-mobility
Message:
Move to Trunk
State: new 2010-08-12T10:28:52 nashif
Comment: None
changes files:
--------------
--- qt-mobility.changes
+++ qt-mobility.changes
@@ -0,0 +1,51 @@
+* Tue Aug 10 2010 Bernd Wachter <ext-bernd.wachter at nokia.com> - 1.0.2
+- Reintroduce spectacle support and yaml file
+- Add add-meego-build-flag.patch patch: add meego build flag and
+ pkgconfig support to contacts and versit modules
+- Build contacts and versit submodules with correct flags
+- Add contextsubscriber-1.0 and fdupes build requires
+
+* Mon Jul 26 2010 Fathi Boudra <fathi.boudra at nokia.com> - 1.0.2
+- Update to 1.0.2
+- Remove patches:
+ 0001_rename_smallsensors.patch - merged
+ 0002_rename_sysinfo.patch - merged
+ 01_fix_ftbfs_incorrect_copy2build_output_value.patch - fixed
+ 03_ftbfs_multimedia_plugin.patch - merged
+- Add libdeclarative-contacts and libdeclarative-sensors packages
+
+* Mon Jul 26 2010 Fathi Boudra <fathi.boudra at nokia.com> - 1.0.1
+- Sanitize spec file
+- Split binary packages
+- Drop spectacle amd yaml file
+- Add patches:
+ 0001_rename_smallsensors.patch
+ 0002_rename_sysinfo.patch
+ 01_fix_ftbfs_incorrect_copy2build_output_value.patch
+ 02_no_rpath.patch
+ 03_ftbfs_multimedia_plugin.patch
+ 04_ftbfs_multimedia_examples.patch
+ 05_fix_translations_install_path.patch
+- Remove obsolete patches:
+ hardcode_import_path.patch
+ remove_private_header.patch
+ add_missing_pulse_lib.patch
+ install_example_executables_under_qt_dir.patch
+ change_QGLWidget_to_QtOpenGL.patch
+
+* Mon Jul 19 2010 Kaitlin Rupert <kaitlin.rupert at linux.intel.com> - 1.0.1
+- Remove patches for issues fixed upstream:
+ qtmobility-qpaintervideosurface.patch
+- Remove obsolete patches needed to build against Qt 4.7 pre-release
+ qt-mobility-1.0.0-install-headers-under-QtMobility.patch
+ fix-sysinfo-compile.patch
+ move-multimedia-out-of-namespace.patch
+ move-bearer-out-of-namespace.patch
+ move-location-out-of-namespace.patch
+ move-publishsubscript-out-of-namespace.patch
+ misc-namespace-fixes.patch
+ fix-install-locations.patch
+ change_qtmedia_export_to_qtmultimedia.patch
+ revert-AspectRatioMode_commit.patch
+ change_QtMedia_to_QtMultimedia.patch
+
old:
----
change_QtMedia_to_QtMultimedia.patch
change_qtmedia_export_to_qtmultimedia.patch
fix-install-locations.patch
fix-sysinfo-compile.patch
misc-namespace-fixes.patch
move-bearer-out-of-namespace.patch
move-location-out-of-namespace.patch
move-multimedia-out-of-namespace.patch
move-publishsubscript-out-of-namespace.patch
qt-mobility-1.0.0-install-headers-under-QtMobility.patch
qt-mobility-1.0.0.tar.gz
qtmobility-qpaintervideosurface.patch
revert-AspectRatioMode_commit.patch
new:
----
0003_adds_-examplesdir_and_-demosdir_options_to_configure.patch
02_no_rpath.patch
04_ftbfs_multimedia_examples.patch
05_fix_translations_install_path.patch
add-meego-build-flag.patch
qt-mobility-opensource-src-1.0.2.tar.gz
spec files:
-----------
--- qt-mobility.spec
+++ qt-mobility.spec
@@ -1,188 +1,996 @@
#
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
#
# >> macros
# << macros
Name: qt-mobility
-Summary: Qt Mobility APIs
-Version: 1.0.0
+Summary: APIs for mobile device functionality
+Version: 1.0.2
Release: 1
Group: System/Libraries
-License: LGPL v2.1
-URL: http://qt.nokia.com
-Source0: %{name}-%{version}.tar.gz
+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-%{version}.tar.gz
Source100: qt-mobility.yaml
-Patch0: qt-enable-playbin2.patch
-Patch1: qt-mobility-1.0.0-install-headers-under-QtMobility.patch
-Patch2: qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
-Patch3: qtmobility-qpaintervideosurface.patch
-Patch4: fix-sysinfo-compile.patch
-Patch5: move-multimedia-out-of-namespace.patch
-Patch6: move-bearer-out-of-namespace.patch
-Patch7: move-location-out-of-namespace.patch
-Patch8: move-publishsubscript-out-of-namespace.patch
-Patch9: misc-namespace-fixes.patch
-Patch10: fix-install-locations.patch
-Patch11: change_qtmedia_export_to_qtmultimedia.patch
-Patch12: revert-AspectRatioMode_commit.patch
-Patch13: change_QtMedia_to_QtMultimedia.patch
-Patch14: default_subtitle_loading.patch
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(QtCore) >= 4.6.0
-BuildRequires: pkgconfig(QtDBus)
-BuildRequires: pkgconfig(QtOpenGL)
-BuildRequires: pkgconfig(QtMultimedia)
-BuildRequires: pkgconfig(QtNetwork)
+Patch0: 02_no_rpath.patch
+Patch1: 04_ftbfs_multimedia_examples.patch
+Patch2: 05_fix_translations_install_path.patch
+Patch3: qt-enable-playbin2.patch
+Patch4: qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
+Patch5: default_subtitle_loading.patch
+Patch6: add-meego-build-flag.patch
BuildRequires: pkgconfig(QtGui)
-BuildRequires: pkgconfig(messageserver)
-BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10.19
-BuildRequires: pkgconfig(gstreamer-base-0.10) >= 0.10.19
-BuildRequires: pkgconfig(gstreamer-interfaces-0.10) >= 0.10.19
-BuildRequires: pkgconfig(gstreamer-audio-0.10) >= 0.10.19
-BuildRequires: pkgconfig(gstreamer-video-0.10) >= 0.10.1
-BuildRequires: pkgconfig(xproto)
-BuildRequires: pkgconfig(xv)
+BuildRequires: pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(QtWebKit)
+BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(bluez)
+BuildRequires: pkgconfig(contextsubscriber-1.0)
+BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(qtopiamail)
BuildRequires: pkgconfig(qttracker)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xv)
BuildRequires: fdupes
-Provides: qt-mobility > 1.0.0beta1
-Provides: qt-mobility < 1.0.0beta1
-Obsoletes: qt-mobility = 1.0.0beta1
%description
-Qt Mobility Project delivers a set of mobile device related APIs to Qt.
-These APIs allow the developer to use these features with ease from one
-framework and apply them to phones, netbooks and non-mobile personal computers.
+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
+apply them to phones, netbooks and non-mobile personal computers.
%package devel
-Summary: Development files for using QtMobility
+Summary: APIs for mobile device functionality - development files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: libqtbearer1 = %{version}
+Requires: libqtcontacts1 = %{version}
+Requires: libqtlocation1 = %{version}
+Requires: libqtmessaging1 = %{version}
+Requires: libqtmultimediakit1 = %{version}
+Requires: libqtpublishsubscribe1 = %{version}
+Requires: libqtsensors1 = %{version}
+Requires: libqtserviceframework1 = %{version}
+Requires: libqtsysteminfo1 = %{version}
+Requires: libqtversit1 = %{version}
%description devel
-This package contains the files necessary to develop QtMobility applications
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the development files needed to build Qt applications
+using Qt Mobility libraries.
+
+
+%package -n libqtbearer1
+Summary: Qt Mobility Bearer Management module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtbearer1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains an API to control the system\'s connectivity state.
+
+
+%package -n libqtcontacts1
+Summary: Qt Mobility Contacts module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtcontacts1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains an API enabling clients to request contact data from
+local or remote backends.
+
+
+%package -n libqtlocation1
+Summary: Qt Mobility Location module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtlocation1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Location API. It provides a library for distributing
+and receiving location data using arbitrary data sources.
+
+
+%package -n libqtmessaging1
+Summary: Qt Mobility Messaging module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtmessaging1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Messaging API. It is a common interface for handling
+SMS, MMS, MIME Email and TNEF Email messages.
+
+
+%package -n libqtmultimediakit1
+Summary: Qt Mobility MultimediaKit module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtmultimediakit1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains a set of APIs to play and record media, and manage a
+collection of media content.
+
+
+%package -n libqtpublishsubscribe1
+Summary: Qt Mobility Publish and Subscribe module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtpublishsubscribe1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Publish and Subscribe API (containing Value Space).
+It enables applications to read item values, navigate through and subscribe to
+change notifications.
+
+
+%package -n libqtsensors1
+Summary: Qt Mobility Sensors module
+Group: System/Libraries
+Requires: libqtsql4-sqlite
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtsensors1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Sensors API. It provides access to sensors.
+
+
+%package -n libqtserviceframework1
+Summary: Qt Mobility Service Framework module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtserviceframework1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains a set of APIs to that allows clients to discover and
+instantiate arbitrary services.
+
+
+%package -n libqtsysteminfo1
+Summary: Qt Mobility System Information module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtsysteminfo1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains a set of APIs to discover system related information and
+capabilities.
+
+
+%package -n libqtversit1
+Summary: Qt Mobility Versit module
+Group: System/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libqtversit1
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains an API to manage Versit documents.
+
+
+%package -n libdeclarative-contacts
+Summary: Qt Mobility Contacts QML plugin
+Group: System/Libraries
+
+%description -n libdeclarative-contacts
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Contacts QML plugin for QtDeclarative.
+
+
+%package -n libdeclarative-multimedia
+Summary: Qt Mobility Multimedia QML plugin
+Group: System/Libraries
+
+%description -n libdeclarative-multimedia
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Multimedia QML plugin for QtDeclarative.
+
+
+%package -n libdeclarative-publishsubscribe
+Summary: Qt Mobility Publish and Subscribe QML plugin
+Group: System/Libraries
+
+%description -n libdeclarative-publishsubscribe
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Publish and Subscribe QML plugin for QtDeclarative.
+
+
+%package -n libdeclarative-sensors
+Summary: Qt Mobility Sensors Framework QML plugin
+Group: System/Libraries
+
+%description -n libdeclarative-sensors
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Sensors QML plugin for QtDeclarative.
+
+
+%package -n libdeclarative-serviceframework
+Summary: Qt Mobility Service Framework QML plugin
+Group: System/Libraries
+
+%description -n libdeclarative-serviceframework
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains the Service Framework QML plugin for QtDeclarative.
+
+
+%package examples
+Summary: Qt Mobility examples
+Group: System/X11
+
+%description examples
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains Qt Mobility examples.
+
+
+%package l10n
+Summary: APIs for mobile device functionality - localization files
+Group: System/I18n
+
+%description l10n
+Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+This package contains Qt Mobility translations.
+
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-opensource-src-%{version}
-# qt-enable-playbin2.patch
+# 02_no_rpath.patch
%patch0 -p1
-# qt-mobility-1.0.0-install-headers-under-QtMobility.patch
+# 04_ftbfs_multimedia_examples.patch
%patch1 -p1
-# qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
+# 05_fix_translations_install_path.patch
%patch2 -p1
-# qtmobility-qpaintervideosurface.patch
+# qt-enable-playbin2.patch
%patch3 -p1
-# fix-sysinfo-compile.patch
+# qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
%patch4 -p1
-# move-multimedia-out-of-namespace.patch
+# default_subtitle_loading.patch
%patch5 -p1
-# move-bearer-out-of-namespace.patch
+# add-meego-build-flag.patch
%patch6 -p1
-# move-location-out-of-namespace.patch
-%patch7 -p1
-# move-publishsubscript-out-of-namespace.patch
-%patch8 -p1
-# misc-namespace-fixes.patch
-%patch9 -p1
-# fix-install-locations.patch
-%patch10 -p1
-# change_qtmedia_export_to_qtmultimedia.patch
-%patch11 -p1
-# revert-AspectRatioMode_commit.patch
-%patch12 -p1
-# change_QtMedia_to_QtMultimedia.patch
-%patch13 -p1
-# default_subtitle_loading.patch
-%patch14 -p1
# >> setup
-
-%define _qt4_prefix %{_libdir}/qt4
-%define _qt4_plugindir %{_qt4_prefix}/plugins
-%define _qt4_examplesdir %{_qt4_prefix}/examples/qt-mobility
-%define _qt4_tools_bindir %{_qt4_prefix}/bin
-
# << setup
%build
# >> build pre
-export PATH=$PATH:/usr/lib/qt4/bin
-
-#Ugly hack - packaging needs to be fixed so that qt-mobility can pick
-#these locations up from pkgconfig
-export QMF_INCLUDEDIR=/usr/include/QtMessagingFramework
-export QMF_LIBDIR=/usr/lib
-
-#Hack - we'll want to include tests, but these are causing build issues
-#Furthermore, we should be using the configure directive, but that includes options that
-#qt-mobility's configure script doesn't support.
-./configure -prefix /usr -examples
+# QMF environment variables should be set
+export QMF_INCLUDEDIR=%{_includedir}/qtopiamail
+export QMF_LIBDIR=%{_libdir}
+./configure \
+-prefix "%{_prefix}" \
+-headerdir "%{_includedir}" \
+-libdir "%{_libdir}" \
+-bindir "%{_bindir}" \
+-plugindir "%{_libdir}/qt4/plugins" \
+-examples \
+-meego
+make %{?_smp_mflags}
# << build pre
-make %{?jobs:-j%jobs}
# >> build post
# << build post
%install
rm -rf %{buildroot}
# >> install pre
-export INSTALL_ROOT=%{buildroot}
# << install pre
-%make_install
# >> install post
-%fdupes %{buildroot}%{_includedir}
+make install INSTALL_ROOT=%{buildroot}
+# Fix wrong path in pkgconfig files
+find %{buildroot}%{_libdir}/pkgconfig -type f -name '*.pc' \
+-exec perl -pi -e "s, -L%{_builddir}/%{name}-opensource-src-%{version}/?\S+,,g" {} \;
+# Remove unpackaged files (examples install is broken)
+rm -f %{buildroot}%{_bindir}/*.txt
+rm -rf %{buildroot}%{_bindir}/battery-subscriber
+rm -rf %{buildroot}%{_bindir}/declarative-sfw-dialer
+rm -rf %{buildroot}%{_bindir}/declarative-sfw-notes
+rm -rf %{buildroot}%{_bindir}/qmlcontacts
+rm -rf %{buildroot}%{_bindir}/xmldata
+# << install post
+%fdupes %{buildroot}/%{_includedir}
+
+
+
+
+
+
+
+
+
+
+%post -n libqtbearer1 -p /sbin/ldconfig
+
+%postun -n libqtbearer1 -p /sbin/ldconfig
+
+
+%post -n libqtcontacts1 -p /sbin/ldconfig
+
+%postun -n libqtcontacts1 -p /sbin/ldconfig
+
+
+%post -n libqtlocation1 -p /sbin/ldconfig
+
+%postun -n libqtlocation1 -p /sbin/ldconfig
+
+
+%post -n libqtmessaging1 -p /sbin/ldconfig
+
+%postun -n libqtmessaging1 -p /sbin/ldconfig
+
+
+%post -n libqtmultimediakit1 -p /sbin/ldconfig
+
+%postun -n libqtmultimediakit1 -p /sbin/ldconfig
+
+
+%post -n libqtpublishsubscribe1 -p /sbin/ldconfig
+
+%postun -n libqtpublishsubscribe1 -p /sbin/ldconfig
+
+
+%post -n libqtsensors1 -p /sbin/ldconfig
+
+%postun -n libqtsensors1 -p /sbin/ldconfig
+
+
+%post -n libqtserviceframework1 -p /sbin/ldconfig
+
+%postun -n libqtserviceframework1 -p /sbin/ldconfig
+
+
+%post -n libqtsysteminfo1 -p /sbin/ldconfig
+
+%postun -n libqtsysteminfo1 -p /sbin/ldconfig
+
+
+%post -n libqtversit1 -p /sbin/ldconfig
+
+%postun -n libqtversit1 -p /sbin/ldconfig
+
+
+
+
+
+
+
+
+
+
+
-# QtMobility.pc
-mkdir %{buildroot}%{_libdir}/pkgconfig
-cat >%{buildroot}%{_libdir}/pkgconfig/QtMobility.pc<<EOF
-libdir=%{_libdir}
-includedir=%{_includedir}/QtMobility
-examplesdir=%{_qt4_examplesdir}
-
-Name: Qtmobility
-Description: Qt Mobility
-Version: %{version}
-EOF
-# << install post
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%files
-%defattr(-,root,root,-)
-# >> files
-%{_libdir}/*.so.*
-%{_qt4_plugindir}/sensors/*.so
-%{_qt4_plugindir}/mediaservice/*.so
-%{_qt4_plugindir}/playlistformats/*.so
-%{_qt4_prefix}/mkspecs/features/mobility.prf
-# << files
%files devel
%defattr(-,root,root,-)
# >> files devel
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/QtMobility.pc
-%{_includedir}/QtMobility/*
-%{_qt4_prefix}/mkspecs/features/mobility.prf
-%{_qt4_prefix}/examples/*
+%{_bindir}/icheck
+%{_bindir}/qcrmlgen
+%{_bindir}/servicedbgen
+%{_bindir}/servicefw
+%{_bindir}/servicexmlgen
+%{_bindir}/vsexplorer
+%{_includedir}/QtBearer/QNetworkConfiguration
+%{_includedir}/QtBearer/QNetworkConfigurationManager
+%{_includedir}/QtBearer/QNetworkSession
+%{_includedir}/QtBearer/qnetworkconfigmanager.h
+%{_includedir}/QtBearer/qnetworkconfiguration.h
+%{_includedir}/QtBearer/qnetworksession.h
+%{_includedir}/QtContacts/QContact
+%{_includedir}/QtContacts/QContactAbstractRequest
+%{_includedir}/QtContacts/QContactAddress
+%{_includedir}/QtContacts/QContactAnniversary
+%{_includedir}/QtContacts/QContactAvatar
+%{_includedir}/QtContacts/QContactBirthday
+%{_includedir}/QtContacts/QContactChangeLogFilter
+%{_includedir}/QtContacts/QContactChangeSet
+%{_includedir}/QtContacts/QContactDetail
+%{_includedir}/QtContacts/QContactDetailDefinition
+%{_includedir}/QtContacts/QContactDetailDefinitionFetchRequest
+%{_includedir}/QtContacts/QContactDetailDefinitionRemoveRequest
+%{_includedir}/QtContacts/QContactDetailDefinitionSaveRequest
+%{_includedir}/QtContacts/QContactDetailFieldDefinition
+%{_includedir}/QtContacts/QContactDetailFilter
+%{_includedir}/QtContacts/QContactDetailRangeFilter
+%{_includedir}/QtContacts/QContactDisplayLabel
+%{_includedir}/QtContacts/QContactEmailAddress
+%{_includedir}/QtContacts/QContactFamily
+%{_includedir}/QtContacts/QContactFetchHint
+%{_includedir}/QtContacts/QContactFetchRequest
+%{_includedir}/QtContacts/QContactFilter
+%{_includedir}/QtContacts/QContactGender
+%{_includedir}/QtContacts/QContactGeoLocation
+%{_includedir}/QtContacts/QContactGlobalPresence
+%{_includedir}/QtContacts/QContactGuid
+%{_includedir}/QtContacts/QContactId
+%{_includedir}/QtContacts/QContactIntersectionFilter
+%{_includedir}/QtContacts/QContactInvalidFilter
+%{_includedir}/QtContacts/QContactLocalIdFetchRequest
+%{_includedir}/QtContacts/QContactLocalIdFilter
+%{_includedir}/QtContacts/QContactManager
+%{_includedir}/QtContacts/QContactManagerEngine
+%{_includedir}/QtContacts/QContactManagerEngineFactory
+%{_includedir}/QtContacts/QContactName
+%{_includedir}/QtContacts/QContactNickname
+%{_includedir}/QtContacts/QContactNote
+%{_includedir}/QtContacts/QContactOnlineAccount
+%{_includedir}/QtContacts/QContactOrganization
+%{_includedir}/QtContacts/QContactPhoneNumber
+%{_includedir}/QtContacts/QContactPresence
+%{_includedir}/QtContacts/QContactRelationship
+%{_includedir}/QtContacts/QContactRelationshipFetchRequest
+%{_includedir}/QtContacts/QContactRelationshipFilter
+%{_includedir}/QtContacts/QContactRelationshipRemoveRequest
+%{_includedir}/QtContacts/QContactRelationshipSaveRequest
+%{_includedir}/QtContacts/QContactRemoveRequest
+%{_includedir}/QtContacts/QContactRingtone
+%{_includedir}/QtContacts/QContactSaveRequest
+%{_includedir}/QtContacts/QContactSortOrder
+%{_includedir}/QtContacts/QContactSyncTarget
+%{_includedir}/QtContacts/QContactTag
+%{_includedir}/QtContacts/QContactThumbnail
+%{_includedir}/QtContacts/QContactTimestamp
+%{_includedir}/QtContacts/QContactType
+%{_includedir}/QtContacts/QContactUnionFilter
+%{_includedir}/QtContacts/QContactUrl
+%{_includedir}/QtContacts/qcontact.h
+%{_includedir}/QtContacts/qcontactabstractrequest.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/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}/QtLocation/QGeoAreaMonitor
+%{_includedir}/QtLocation/QGeoCoordinate
+%{_includedir}/QtLocation/QGeoPositionInfo
+%{_includedir}/QtLocation/QGeoPositionInfoSource
+%{_includedir}/QtLocation/QGeoSatelliteInfo
+%{_includedir}/QtLocation/QGeoSatelliteInfoSource
+%{_includedir}/QtLocation/QNmeaPositionInfoSource
+%{_includedir}/QtLocation/qgeoareamonitor.h
+%{_includedir}/QtLocation/qgeocoordinate.h
+%{_includedir}/QtLocation/qgeopositioninfo.h
+%{_includedir}/QtLocation/qgeopositioninfosource.h
+%{_includedir}/QtLocation/qgeosatelliteinfo.h
+%{_includedir}/QtLocation/qgeosatelliteinfosource.h
+%{_includedir}/QtLocation/qnmeapositioninfosource.h
+%{_includedir}/QtMessaging/QMessage
+%{_includedir}/QtMessaging/QMessageAccount
+%{_includedir}/QtMessaging/QMessageAccountFilter
+%{_includedir}/QtMessaging/QMessageAccountId
+%{_includedir}/QtMessaging/QMessageAccountSortOrder
+%{_includedir}/QtMessaging/QMessageAddress
+%{_includedir}/QtMessaging/QMessageContentContainer
+%{_includedir}/QtMessaging/QMessageContentContainerId
+%{_includedir}/QtMessaging/QMessageFilter
+%{_includedir}/QtMessaging/QMessageFolder
+%{_includedir}/QtMessaging/QMessageFolderFilter
+%{_includedir}/QtMessaging/QMessageFolderId
+%{_includedir}/QtMessaging/QMessageFolderSortOrder
+%{_includedir}/QtMessaging/QMessageId
+%{_includedir}/QtMessaging/QMessageManager
+%{_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}/QtMultimediaKit/QAbstractAudioDeviceInfo
+%{_includedir}/QtMultimediaKit/QAbstractAudioInput
+%{_includedir}/QtMultimediaKit/QAbstractAudioOutput
+%{_includedir}/QtMultimediaKit/QAbstractVideoBuffer
+%{_includedir}/QtMultimediaKit/QAbstractVideoSurface
+%{_includedir}/QtMultimediaKit/QAudioCaptureSource
+%{_includedir}/QtMultimediaKit/QAudioDeviceInfo
+%{_includedir}/QtMultimediaKit/QAudioEncoderControl
+%{_includedir}/QtMultimediaKit/QAudioEncoderSettings
+%{_includedir}/QtMultimediaKit/QAudioEndpointSelector
+%{_includedir}/QtMultimediaKit/QAudioFormat
+%{_includedir}/QtMultimediaKit/QAudioInput
+%{_includedir}/QtMultimediaKit/QAudioOutput
+%{_includedir}/QtMultimediaKit/QAudioSystemPlugin
+%{_includedir}/QtMultimediaKit/QGraphicsVideoItem
+%{_includedir}/QtMultimediaKit/QImageEncoderControl
+%{_includedir}/QtMultimediaKit/QImageEncoderSettings
+%{_includedir}/QtMultimediaKit/QLocalMediaPlaylistProvider
+%{_includedir}/QtMultimediaKit/QMediaBindableInterface
+%{_includedir}/QtMultimediaKit/QMediaContainerControl
+%{_includedir}/QtMultimediaKit/QMediaContent
+%{_includedir}/QtMultimediaKit/QMediaControl
+%{_includedir}/QtMultimediaKit/QMediaImageViewer
+%{_includedir}/QtMultimediaKit/QMediaObject
+%{_includedir}/QtMultimediaKit/QMediaPlayer
+%{_includedir}/QtMultimediaKit/QMediaPlayerControl
+%{_includedir}/QtMultimediaKit/QMediaPlaylist
+%{_includedir}/QtMultimediaKit/QMediaPlaylistControl
+%{_includedir}/QtMultimediaKit/QMediaPlaylistIOPlugin
+%{_includedir}/QtMultimediaKit/QMediaPlaylistNavigator
+%{_includedir}/QtMultimediaKit/QMediaPlaylistProvider
+%{_includedir}/QtMultimediaKit/QMediaPlaylistReader
+%{_includedir}/QtMultimediaKit/QMediaPlaylistSourceControl
+%{_includedir}/QtMultimediaKit/QMediaPlaylistWriter
+%{_includedir}/QtMultimediaKit/QMediaRecorder
+%{_includedir}/QtMultimediaKit/QMediaRecorderControl
+%{_includedir}/QtMultimediaKit/QMediaResource
+%{_includedir}/QtMultimediaKit/QMediaService
+%{_includedir}/QtMultimediaKit/QMediaServiceProvider
+%{_includedir}/QtMultimediaKit/QMediaServiceProviderHint
+%{_includedir}/QtMultimediaKit/QMediaServiceProviderPlugin
+%{_includedir}/QtMultimediaKit/QMediaStreamsControl
+%{_includedir}/QtMultimediaKit/QMediaTimeInterval
+%{_includedir}/QtMultimediaKit/QMediaTimeRange
+%{_includedir}/QtMultimediaKit/QMetaDataReaderControl
+%{_includedir}/QtMultimediaKit/QMetaDataWriterControl
+%{_includedir}/QtMultimediaKit/QRadioTuner
+%{_includedir}/QtMultimediaKit/QRadioTunerControl
+%{_includedir}/QtMultimediaKit/QVideoDeviceControl
+%{_includedir}/QtMultimediaKit/QVideoEncoderControl
+%{_includedir}/QtMultimediaKit/QVideoEncoderSettings
+%{_includedir}/QtMultimediaKit/QVideoFrame
+%{_includedir}/QtMultimediaKit/QVideoRendererControl
+%{_includedir}/QtMultimediaKit/QVideoSurfaceFormat
+%{_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/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}/QtPublishSubscribe/QValueSpacePublisher
+%{_includedir}/QtPublishSubscribe/QValueSpaceSubscriber
+%{_includedir}/QtPublishSubscribe/qvaluespace.h
+%{_includedir}/QtPublishSubscribe/qvaluespacepublisher.h
+%{_includedir}/QtPublishSubscribe/qvaluespacesubscriber.h
+%{_includedir}/QtSensors/QAccelerometer
+%{_includedir}/QtSensors/QAccelerometerFilter
+%{_includedir}/QtSensors/QAccelerometerReading
+%{_includedir}/QtSensors/QAmbientLightFilter
+%{_includedir}/QtSensors/QAmbientLightReading
+%{_includedir}/QtSensors/QAmbientLightSensor
+%{_includedir}/QtSensors/QCompass
+%{_includedir}/QtSensors/QCompassFilter
+%{_includedir}/QtSensors/QCompassReading
+%{_includedir}/QtSensors/QMagnetometer
+%{_includedir}/QtSensors/QMagnetometerFilter
+%{_includedir}/QtSensors/QMagnetometerReading
+%{_includedir}/QtSensors/QOrientationFilter
+%{_includedir}/QtSensors/QOrientationReading
+%{_includedir}/QtSensors/QOrientationSensor
+%{_includedir}/QtSensors/QProximityFilter
+%{_includedir}/QtSensors/QProximityReading
+%{_includedir}/QtSensors/QProximitySensor
+%{_includedir}/QtSensors/QRotationFilter
+%{_includedir}/QtSensors/QRotationReading
+%{_includedir}/QtSensors/QRotationSensor
+%{_includedir}/QtSensors/QSensor
+%{_includedir}/QtSensors/QSensorBackend
+%{_includedir}/QtSensors/QSensorBackendFactory
+%{_includedir}/QtSensors/QSensorFilter
+%{_includedir}/QtSensors/QSensorManager
+%{_includedir}/QtSensors/QSensorPluginInterface
+%{_includedir}/QtSensors/QSensorReading
+%{_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/QAbstractSecuritySession
+%{_includedir}/QtServiceFramework/QServiceContext
+%{_includedir}/QtServiceFramework/QServiceFilter
+%{_includedir}/QtServiceFramework/QServiceInterfaceDescriptor
+%{_includedir}/QtServiceFramework/QServiceManager
+%{_includedir}/QtServiceFramework/QServicePluginInterface
+%{_includedir}/QtServiceFramework/qabstractsecuritysession.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/QSystemDeviceInfo
+%{_includedir}/QtSystemInfo/QSystemDisplayInfo
+%{_includedir}/QtSystemInfo/QSystemInfo
+%{_includedir}/QtSystemInfo/QSystemNetworkInfo
+%{_includedir}/QtSystemInfo/QSystemScreenSaver
+%{_includedir}/QtSystemInfo/QSystemStorageInfo
+%{_includedir}/QtSystemInfo/qsysteminfo.h
+%{_includedir}/QtVersit/QVersitContactExporter
+%{_includedir}/QtVersit/QVersitContactExporterDetailHandler
+%{_includedir}/QtVersit/QVersitContactImporter
+%{_includedir}/QtVersit/QVersitContactImporterPropertyHandler
+%{_includedir}/QtVersit/QVersitDefaultResourceHandler
+%{_includedir}/QtVersit/QVersitDocument
+%{_includedir}/QtVersit/QVersitProperty
+%{_includedir}/QtVersit/QVersitReader
+%{_includedir}/QtVersit/QVersitResourceHandler
+%{_includedir}/QtVersit/QVersitWriter
+%{_includedir}/QtVersit/qversitcontactexporter.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}/qmobilityglobal.h
+%{_libdir}/libQtBearer.prl
+%{_libdir}/libQtBearer.so
+%{_libdir}/libQtContacts.prl
+%{_libdir}/libQtContacts.so
+%{_libdir}/libQtLocation.prl
+%{_libdir}/libQtLocation.so
+%{_libdir}/libQtMessaging.prl
+%{_libdir}/libQtMessaging.so
+%{_libdir}/libQtMultimediaKit.prl
+%{_libdir}/libQtMultimediaKit.so
+%{_libdir}/libQtPublishSubscribe.prl
+%{_libdir}/libQtPublishSubscribe.so
+%{_libdir}/libQtSensors.prl
+%{_libdir}/libQtSensors.so
+%{_libdir}/libQtServiceFramework.prl
+%{_libdir}/libQtServiceFramework.so
+%{_libdir}/libQtSystemInfo.prl
+%{_libdir}/libQtSystemInfo.so
+%{_libdir}/libQtVersit.prl
+%{_libdir}/libQtVersit.so
+%{_libdir}/pkgconfig/QtContacts.pc
+%{_libdir}/pkgconfig/QtVersit.pc
+%{_datadir}/qt4/mkspecs/features/mobility.prf
+%{_datadir}/qt4/mkspecs/features/mobilityconfig.prf
# << files devel
+%files -n libqtbearer1
+%defattr(-,root,root,-)
+# >> files libqtbearer1
+%{_libdir}/libQtBearer.so.*
+# << files libqtbearer1
+
+%files -n libqtcontacts1
+%defattr(-,root,root,-)
+# >> files libqtcontacts1
+%{_libdir}/libQtContacts.so.*
+# << files libqtcontacts1
+
+%files -n libqtlocation1
+%defattr(-,root,root,-)
+# >> files libqtlocation1
+%{_libdir}/libQtLocation.so.*
+# << files libqtlocation1
+
+%files -n libqtmessaging1
+%defattr(-,root,root,-)
+# >> files libqtmessaging1
+%{_libdir}/libQtMessaging.so.*
+# << files libqtmessaging1
+
+%files -n libqtmultimediakit1
+%defattr(-,root,root,-)
+# >> files libqtmultimediakit1
+%{_libdir}/libQtMultimediaKit.so.*
+%{_libdir}/qt4/plugins/mediaservice/libqgstengine.so
+%{_libdir}/qt4/plugins/mediaservice/libqtmedia_v4lengine.so
+%{_libdir}/qt4/plugins/playlistformats/libqtmultimediakit_m3u.so
+# << files libqtmultimediakit1
+
+%files -n libqtpublishsubscribe1
+%defattr(-,root,root,-)
+# >> files libqtpublishsubscribe1
+%{_libdir}/libQtPublishSubscribe.so.*
+# << files libqtpublishsubscribe1
+
+%files -n libqtsensors1
+%defattr(-,root,root,-)
+# >> files libqtsensors1
+%{_libdir}/libQtSensors.so.*
+%{_libdir}/qt4/plugins/sensors/libqtsensors_generic.so
+# << files libqtsensors1
+
+%files -n libqtserviceframework1
+%defattr(-,root,root,-)
+# >> files libqtserviceframework1
+%{_libdir}/libQtServiceFramework.so.*
+# << files libqtserviceframework1
+
+%files -n libqtsysteminfo1
+%defattr(-,root,root,-)
+# >> files libqtsysteminfo1
+%{_libdir}/libQtSystemInfo.so.*
+# << files libqtsysteminfo1
+
+%files -n libqtversit1
+%defattr(-,root,root,-)
+# >> files libqtversit1
+%{_libdir}/libQtVersit.so.*
+# << files libqtversit1
+
+%files -n libdeclarative-contacts
+%defattr(-,root,root,-)
+# >> files libdeclarative-contacts
+%{_libdir}/qt4/imports/QtMobility/contacts/libdeclarative_contacts.so
+%{_libdir}/qt4/imports/QtMobility/contacts/qmldir
+# << files libdeclarative-contacts
+
+%files -n libdeclarative-multimedia
+%defattr(-,root,root,-)
+# >> files libdeclarative-multimedia
+%{_libdir}/qt4/imports/Qt/multimedia/libdeclarative_multimedia.so
+%{_libdir}/qt4/imports/Qt/multimedia/qmldir
+# << files libdeclarative-multimedia
+
+%files -n libdeclarative-publishsubscribe
+%defattr(-,root,root,-)
+# >> files libdeclarative-publishsubscribe
+%{_libdir}/qt4/imports/QtMobility/publishsubscribe/libdeclarative_publishsubscribe.so
+%{_libdir}/qt4/imports/QtMobility/publishsubscribe/qmldir
+# << files libdeclarative-publishsubscribe
+
+%files -n libdeclarative-sensors
+%defattr(-,root,root,-)
+# >> files libdeclarative-sensors
+%{_libdir}/qt4/imports/QtMobility/sensors/libdeclarative_sensors.so
+%{_libdir}/qt4/imports/QtMobility/sensors/qmldir
+# << files libdeclarative-sensors
+
+%files -n libdeclarative-serviceframework
+%defattr(-,root,root,-)
+# >> files libdeclarative-serviceframework
+%{_libdir}/qt4/imports/QtMobility/serviceframework/libdeclarative_serviceframework.so
+%{_libdir}/qt4/imports/QtMobility/serviceframework/qmldir
+# << files libdeclarative-serviceframework
+
+%files examples
+%defattr(-,root,root,-)
+# >> files examples
+%{_bindir}/accel
+%{_bindir}/arrowkeys
+%{_bindir}/audiodevices
+%{_bindir}/audioinput
+%{_bindir}/audiooutput
+%{_bindir}/audiorecorder
+%{_bindir}/battery-publisher
+%{_bindir}/bearercloud
+%{_bindir}/bearermonitor
+%{_bindir}/cubehouse
+%{_bindir}/fetchgooglemaps
+%{_bindir}/flickrdemo
+%{_bindir}/grueapp
+%{_bindir}/keepintouch
+%{_bindir}/lightmaps_with_location
+%{_bindir}/logfilepositionsource
+%{_bindir}/metadata
+%{_bindir}/orientation
+%{_bindir}/player
+%{_bindir}/publish-subscribe
+%{_bindir}/qsysinfo
+%{_bindir}/querymessages
+%{_bindir}/radio
+%{_bindir}/reading_perf
+%{_bindir}/samplephonebook
+%{_bindir}/satellitedialog
+%{_bindir}/sensor_explorer
+%{_bindir}/serviceactions
+%{_bindir}/servicebrowser
+%{_bindir}/sfw-notes
+%{_bindir}/show_acceleration
+%{_bindir}/show_als
+%{_bindir}/show_compass
+%{_bindir}/show_magneticflux
+%{_bindir}/show_orientation
+%{_bindir}/show_proximity
+%{_bindir}/show_rotation
+%{_bindir}/show_tap
+%{_bindir}/slideshow
+%{_bindir}/smallsensors
+%{_bindir}/videographicsitem
+%{_bindir}/videowidget
+%{_bindir}/weatherinfo_with_location
+%{_bindir}/writemessage
+%{_libdir}/qt4/plugins/sensors/libqtsensors_grueplugin.so
+%{_libdir}/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
+%{_libdir}/qt4/plugins/serviceframework/libserviceframework_filemanagerplugin.so
+%{_libdir}/qt4/plugins/serviceframework/libserviceframework_landlinedialerservice.so
+%{_libdir}/qt4/plugins/serviceframework/libserviceframework_notesmanagerplugin.so
+%{_libdir}/qt4/plugins/serviceframework/libserviceframework_voipdialerservice.so
+# << files examples
+
+%files l10n
+%defattr(-,root,root,-)
+# >> files l10n
+%{_datadir}/qtmobility/translations/qtmobility_ar.qm
+%{_datadir}/qtmobility/translations/qtmobility_cs.qm
+%{_datadir}/qtmobility/translations/qtmobility_da.qm
+%{_datadir}/qtmobility/translations/qtmobility_de.qm
+%{_datadir}/qtmobility/translations/qtmobility_es.qm
+%{_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_pl.qm
+%{_datadir}/qtmobility/translations/qtmobility_pt.qm
+%{_datadir}/qtmobility/translations/qtmobility_ru.qm
+%{_datadir}/qtmobility/translations/qtmobility_sk.qm
+%{_datadir}/qtmobility/translations/qtmobility_sl.qm
+%{_datadir}/qtmobility/translations/qtmobility_sv.qm
+%{_datadir}/qtmobility/translations/qtmobility_uk.qm
+%{_datadir}/qtmobility/translations/qtmobility_zh_CN.qm
+%{_datadir}/qtmobility/translations/qtmobility_zh_TW.qm
+# << files l10n
+
other changes:
--------------
++++++ 0003_adds_-examplesdir_and_-demosdir_options_to_configure.patch (new)
--- 0003_adds_-examplesdir_and_-demosdir_options_to_configure.patch
+++ 0003_adds_-examplesdir_and_-demosdir_options_to_configure.patch
+From ccb423e04fc349dc8fa72a9537ec8a14627b3ed0 Mon Sep 17 00:00:00 2001
+From: Alex <qt-info at nokia.com>
+Date: Tue, 22 Jun 2010 13:45:47 +1000
+Subject: [PATCH] add support for -examplesdir and -demosdir configure option
+
+Task-number: QTMOBILITY-320
+---
+ configure | 38 +++++++++++++++-
+ configure.bat | 38 +++++++++++++--
+ demos/demos.pri | 10 ++++
+ demos/lightmaps/lightmaps.pro | 2 +-
+ demos/player/player.pro | 2 +-
+ demos/qmlcontacts/qmlcontacts.pro | 2 +-
+ demos/serviceactions/serviceactions.pro | 2 +-
+ .../small_screen_sensors/small_screen_sensors.pro | 2 +-
+ demos/weatherinfo/weatherinfo.pro | 2 +-
+ examples/examples.pri | 47 +------------------
+ features/basic_examples_setup.prf | 49 ++++++++++++++++++++
+ 11 files changed, 137 insertions(+), 57 deletions(-)
+ create mode 100644 demos/demos.pri
+ create mode 100644 features/basic_examples_setup.prf
+
+diff --git a/configure b/configure
+index 6c714d6..c56bb89 100755
+--- a/configure
++++ b/configure
+@@ -86,6 +86,8 @@ QT_MOBILITY_INCLUDE=
+ QT_MOBILITY_LIB=
+ QT_MOBILITY_BIN=
+ QT_MOBILITY_PLUGINS=
++QT_MOBILITY_EXAMPLES=
++QT_MOBILITY_DEMOS=
+ BUILD_UNITTESTS=
+ BUILD_EXAMPLES=
+ BUILD_DEMOS=
+@@ -123,6 +125,10 @@ usage()
+ echo " (default PREFIX/bin)"
+ echo "-plugindir <dir> .. Plug-ins will be installed to <dir>"
+ echo " (default PREFIX/plugins)"
++ echo "-demosdir <dir> ... Demos will be installed to <dir>"
++ echo " (default PREFIX/bin)"
++ echo "-examplesdir <dir> Examples will be installed to <dir>"
++ echo " (default PREFIX/bin)"
+ echo "-debug ............ Build with debugging symbols"
+ echo "-release .......... Build without debugging symbols"
+ echo "-silent ........... Reduces build output"
+@@ -143,7 +149,7 @@ usage()
+ echo " will automatically be enabled."
+ echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)."
+ echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Freemantle)."
+- echo "-sdk <sdk>..........Build using Apple provided SDK <path/to/sdk>."
++ echo "-sdk <sdk>......... Build using Apple provided SDK <path/to/sdk>."
+ echo " example: -sdk /Developer/SDKs/MacOSX10.6.sdk"
+ echo
+
+@@ -180,6 +186,14 @@ while [ "$#" -gt 0 ]; do
+ QT_MOBILITY_PLUGINS="$2"
+ shift
+ ;;
++ -examplesdir)
++ QT_MOBILITY_EXAMPLES="$2"
++ shift
++ ;;
++ -demosdir)
++ QT_MOBILITY_DEMOS="$2"
++ shift
++ ;;
+ -tests)
+ BUILD_UNITTESTS="yes"
+ ;;
+@@ -367,6 +381,28 @@ else
+ fi
+ echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
+
++#process examples path
++if [ -z "$QT_MOBILITY_EXAMPLES" ]; then
++ QT_MOBILITY_EXAMPLES="$QT_MOBILITY_PREFIX/$BIN_PATH"
++else
++ QT_MOBILITY_EXAMPLES=`absPath $QT_MOBILITY_EXAMPLES $LINUX_TARGET`
++ if [ "$?" -eq "1" ]; then
++ exit 1
++ fi
++fi
++echo "QT_MOBILITY_EXAMPLES = $QT_MOBILITY_EXAMPLES" >> "$CONFIG_IN"
++
++#process demos path
++if [ -z "$QT_MOBILITY_DEMOS" ]; then
++ QT_MOBILITY_DEMOS="$QT_MOBILITY_PREFIX/$BIN_PATH"
++else
++ QT_MOBILITY_DEMOS=`absPath $QT_MOBILITY_DEMOS $LINUX_TARGET`
++ if [ "$?" -eq "1" ]; then
++ exit 1
++ fi
++fi
++echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS" >> "$CONFIG_IN"
++
+
+ echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE"
+ echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE"
+diff --git a/configure.bat b/configure.bat
+index d2eee4c..5a544c2 100644
+--- a/configure.bat
++++ b/configure.bat
+@@ -82,6 +82,8 @@ if "%1" == "-libdir" goto libTag
+ if "%1" == "-bindir" goto binTag
+ if "%1" == "-headerdir" goto headerTag
+ if "%1" == "-plugindir" goto pluginTag
++if "%1" == "-examplesdir" goto examplesDirTag
++if "%1" == "-demosdir" goto demosDirTag
+ if "%1" == "-tests" goto testTag
+ if "%1" == "-examples" goto exampleTag
+ if "%1" == "-demos" goto demosTag
+@@ -117,6 +119,10 @@ echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)]
+ echo (default PREFIX/bin)
+ echo -plugindir (dir) .. Plug-ins will be installed to dir
+ echo (default PREFIX/plugins)
++ echo -examplesdir (dir) Examples will be installed to dir
++ echo (default PREFIX/bin)
++ echo -demosdir (dir) ... Demos will be installed to dir
++ echo (default PREFIX/bin)
+ echo -debug ............ Build with debugging symbols
+ echo -release .......... Build without debugging symbols
+ echo -silent ........... Reduces build output
+@@ -194,6 +200,20 @@ shift
+ echo
+ goto cmdline_parsing
+
++:examplesDirTag
++shift
++echo QT_MOBILITY_EXAMPLES = %1 >> %PROJECT_CONFIG%
++shift
++echo
++goto cmdline_parsing
++
++:demosDirTag
++shift
++echo QT_MOBILITY_DEMOS =%1 >> %PROJECT_CONFIG%
++shift
++echo
++goto cmdline_parsing
++
+ :unfrozenTag
+ REM Should never be used in release builds
+ REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
+@@ -354,6 +374,8 @@ echo !symbian:isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_P
+ echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
+ echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+ echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
++echo isEmpty($$QT_MOBILITY_EXAMPLES):QT_MOBILITY_EXAMPLES=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
++echo isEmpty($$QT_MOBILITY_DEMOS):QT_MOBILITY_DEMOS=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+
+ echo mobility_modules = %MOBILITY_MODULES% >> %PROJECT_CONFIG%
+ REM no Sysinfo support on Maemo yet
+@@ -599,9 +621,11 @@ set QT_PATH=
+ set SOURCE_PATH=
+ set MOBILITY_MODULES=
+ set MOBILITY_MODULES_UNPARSED=
+-SET REMAINING=
+-SET FIRST=
+-SET MODULES_TEMP=
++set REMAINING=
++set FIRST=
++set MODULES_TEMP=
++set QT_MOBILITY_EXAMPLES=
++set QT_MOBILITY_DEMOS=
+ exit /b 1
+
+ :exitTag
+@@ -616,7 +640,9 @@ set QT_PATH=
+ set SOURCE_PATH=
+ set MOBILITY_MODULES=
+ set MOBILITY_MODULES_UNPARSED=
+-SET REMAINING=
+-SET FIRST=
+-SET MODULES_TEMP=
++set REMAINING=
++set FIRST=
++set MODULES_TEMP=
++set QT_MOBILITY_EXAMPLES=
++set QT_MOBILITY_DEMOS=
+ exit /b 0
+diff --git a/demos/demos.pri b/demos/demos.pri
+new file mode 100644
+index 0000000..211abbb
+--- /dev/null
++++ b/demos/demos.pri
+@@ -0,0 +1,10 @@
++load(basic_examples_setup)
++
++!plugin {
++ target.path=$$QT_MOBILITY_DEMOS
++} else {
++ target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
++}
++INSTALLS += target
++
++
+diff --git a/demos/lightmaps/lightmaps.pro b/demos/lightmaps/lightmaps.pro
(191 more lines skipped)
++++++ 02_no_rpath.patch (new)
--- 02_no_rpath.patch
+++ 02_no_rpath.patch
+Description: Remove rpath
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/common.pri
++++ b/common.pri
+@@ -106,7 +106,6 @@ contains(build_unit_tests, yes):DEFINES+
+ MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
+ RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
+ UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
+- QMAKE_RPATHDIR += $$QT_MOBILITY_LIB
+ } else {
+ # Unit test code (no plugins! test plugins are just normal plugins installed elsewhere)
+ QT *= testlib
+@@ -117,7 +116,6 @@ contains(build_unit_tests, yes):DEFINES+
+ MOC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/moc
+ RCC_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/rcc
+ UI_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET/ui
+- QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+ }
+
+ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
+--- a/examples/audiodevices/audiodevices.pro
++++ b/examples/audiodevices/audiodevices.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = audiodevices.h
+
+ SOURCES = audiodevices.cpp \
+--- a/examples/audioinput/audioinput.pro
++++ b/examples/audioinput/audioinput.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = audioinput.h
+
+ SOURCES = audioinput.cpp \
+--- a/examples/audiooutput/audiooutput.pro
++++ b/examples/audiooutput/audiooutput.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = audiooutput.h
+
+ SOURCES = audiooutput.cpp \
+--- a/examples/audiorecorder/audiorecorder.pro
++++ b/examples/audiorecorder/audiorecorder.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = \
+ audiorecorder.h
+
+--- a/examples/examples.pri
++++ b/examples/examples.pri
+@@ -26,7 +26,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
+-QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib
+ INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
+
+ !plugin {
+--- a/examples/radio/radio.pro
++++ b/examples/radio/radio.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = \
+ radio.h
+
+--- a/examples/videographicsitem/videographicsitem.pro
++++ b/examples/videographicsitem/videographicsitem.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ contains(QT_CONFIG, opengl): QT += opengl
+
+ HEADERS += videoplayer.h \
+--- a/examples/videowidget/videowidget.pro
++++ b/examples/videowidget/videowidget.pro
+@@ -7,8 +7,6 @@ include(../examples.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+
+-QMAKE_RPATHDIR += $$DESTDIR
+-
+ HEADERS = \
+ videoplayer.h \
+ videowidget.h \
+--- a/features/mobility.prf.template
++++ b/features/mobility.prf.template
+@@ -13,7 +13,6 @@
+ }
+ mac: LIBS += -F$${MOBILITY_LIB}
+ LIBS+= -L$${MOBILITY_LIB}
+-QMAKE_RPATHDIR+=$${MOBILITY_LIB}
+
+ contains(MOBILITY, bearer) {
+ DEFINES += QT_MOBILITY_BEARER
++++++ 04_ftbfs_multimedia_examples.patch (new)
--- 04_ftbfs_multimedia_examples.patch
+++ 04_ftbfs_multimedia_examples.patch
+Description: Fix multimediakit examples link failure (undefined reference to pulseaudio functions)
+
+QT_CFLAGS_PULSEAUDIO and QT_LIBS_PULSEAUDIO are defined by Qt's configure.
+Qt Mobility's confgure should defined them.
+As a workaround, define a 'standard' value.
+
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/src/multimedia/effects/effects.pri
++++ b/src/multimedia/effects/effects.pri
+@@ -6,8 +6,8 @@ unix:!mac:!symbian {
+ DEFINES += QT_MULTIMEDIA_PULSEAUDIO
+ PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
+ SOURCES += effects/qsoundeffect_pulse_p.cpp
+- QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO
+- LIBS += $$QT_LIBS_PULSEAUDIO
++ QMAKE_CXXFLAGS += -D_REENTRANT
++ LIBS += -lpulse
+ } else {
+ DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
+ PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
++++++ 05_fix_translations_install_path.patch (new)
--- 05_fix_translations_install_path.patch
+++ 05_fix_translations_install_path.patch
+Description: install translations in /usr/share/qtmobility/translations/
+ instead of /usr/translations/
+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
+ }
+
+-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
++++++ Makefile
--- Makefile
+++ Makefile
@@ -2,5 +2,5 @@
SPECFILE = $(addsuffix .spec, $(PKG_NAME))
YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
-include /usr/share/packaging-tools/Makefile.common
+include /usr/share/meego-packaging-tools/Makefile.common
++++++ add-meego-build-flag.patch (new)
--- add-meego-build-flag.patch
+++ add-meego-build-flag.patch
+Description: Add meego build flag and
+pkgconfig support to contacts and versit modules
+Author: Bernd Wachter <ext-bernd.wachter at nokia.com>
+
+--- a/configure
++++ b/configure
+@@ -147,6 +147,7 @@ usage()
+ echo " will automatically be enabled."
+ echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)."
+ echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Freemantle)."
++ echo "-meego ............ Build Qt Mobility for MeeGo."
+ echo "-sdk <sdk>..........Build using Apple provided SDK <path/to/sdk>."
+ echo " example: -sdk /Developer/SDKs/MacOSX10.6.sdk"
+ echo
+@@ -211,6 +212,9 @@ while [ "$#" -gt 0 ]; do
+ -maemo6)
+ LINUX_TARGET=maemo6
+ ;;
++ -meego)
++ LINUX_TARGET=meego
++ ;;
+ -sdk)
+ MAC_SDK="$2"
+ shift
+@@ -313,6 +317,8 @@ if [ -n "$LINUX_TARGET" ]; then
+ echo "CONFIG+=maemo5" >> "$CONFIG_IN"
+ elif [ "$LINUX_TARGET" = "maemo6" ]; then
+ echo "CONFIG+=maemo6" >> "$CONFIG_IN"
++ elif [ "$LINUX_TARGET" = "meego" ]; then
++ echo "CONFIG+=meego" >> "$CONFIG_IN"
+ fi
+ fi
+
+--- a/src/contacts/contacts.pro
++++ b/src/contacts/contacts.pro
+@@ -74,13 +74,18 @@ maemo5 {
+ isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=maemo5
+ }
+
+-maemo6 {
++maemo6|meego {
+ isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=tracker
+ }
+
+-maemo5|maemo6 {
++include(../../features/deploy.pri)
++
++maemo5|maemo6|meego {
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Contacts API
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$headers.pat
+ pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
+ pkgconfig.files = QtContacts.pc
+
+@@ -110,4 +115,3 @@ symbian {
+ !isEmpty(CONTACTS_DEFAULT_ENGINE): DEFINES += Q_CONTACTS_DEFAULT_ENGINE=$$CONTACTS_DEFAULT_ENGINE
+
+ CONFIG += app
+-include(../../features/deploy.pri)
+--- a/src/versit/versit.pro
++++ b/src/versit/versit.pro
+@@ -71,14 +71,17 @@ symbian {
+ -TCB
+ }
+
+-maemo5|maemo6 {
++CONFIG += app
++include(../../features/deploy.pri)
++
++maemo5|maemo6|meego {
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Versit API
+- pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_LIBDIR = $$target.path
++ QMAKE_PKGCONFIG_INCDIR = $$headers.path
+ pkgconfig.files = QtVersit.pc
+
+ INSTALLS += pkgconfig
+ }
+
+-CONFIG += app
+-include(../../features/deploy.pri)
+--- a/common.pri
++++ b/common.pri
+@@ -129,6 +129,12 @@ maemo6 {
+ maemo5 {
+ DEFINES+= Q_WS_MAEMO_5
+ }
++meego {
++ # DEFINES+= Q_WS_MAEMO_6
++ contains(TEMPLATE,.*app.*): QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
++ QMAKE_LIB_FLAGS+= -Wl,-rpath-link $$[QT_INSTALL_LIBS]
++ QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
++}
+
+ wince* {
+ ### Bearer Management
++++++ default_subtitle_loading.patch
--- default_subtitle_loading.patch
+++ default_subtitle_loading.patch
@@ -1,12 +1,11 @@
From: Jacob Chen <jacob.chen at intel.com>
Subject: [PATCH] Enable default subtitle laoding
-Description: This patch enables the Gstreamer plugin to load the external subtitle file which in same directory and has same name as video file.
+Description: This patch enables the Gstreamer plugin to load the external
+subtitle file which in same directory and has same name as video file.
-diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
-index 58ba160..258a46a 100644
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
-@@ -304,6 +304,35 @@ void QGstreamerPlayerControl::setMedia(const QMediaContent &content, QIODevice *
+@@ -310,6 +310,35 @@ void QGstreamerPlayerControl::setMedia(c
}
if (!url.isEmpty()) {
@@ -42,11 +41,9 @@
if (m_mediaStatus != QMediaPlayer::LoadingMedia)
emit mediaStatusChanged(m_mediaStatus = QMediaPlayer::LoadingMedia);
m_session->pause();
-diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
-index 942a8ba..271634a 100644
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
-@@ -151,6 +151,26 @@ void QGstreamerPlayerSession::load(const QUrl &url)
+@@ -155,6 +155,26 @@ void QGstreamerPlayerSession::load(const
}
}
@@ -73,11 +70,9 @@
qint64 QGstreamerPlayerSession::duration() const
{
return m_duration;
-diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
-index 17f17bd..a9a4853 100644
--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
+++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
-@@ -102,7 +102,10 @@ public:
+@@ -108,7 +108,10 @@ public:
public slots:
void load(const QUrl &url);
++++++ qt-enable-playbin2.patch
--- qt-enable-playbin2.patch
+++ qt-enable-playbin2.patch
@@ -1,11 +1,13 @@
-diff -Naur qt-mobility-1.0.0/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp qt-mobility-1.0.0-new/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
---- qt-mobility-1.0.0/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp 2010-06-01 14:10:11.000000000 -0700
-+++ qt-mobility-1.0.0-new/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp 2010-06-21 16:01:18.333155374 -0700
-@@ -49,9 +49,7 @@
+Description: use playbin2 inconditionaly
+Author: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+
+--- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
++++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+@@ -55,9 +55,7 @@
#include <QtCore/qdatetime.h>
#include <QtCore/qdebug.h>
--#ifdef Q_WS_MAEMO_5
+-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
#define USE_PLAYBIN2
-#endif
++++++ qt-mobility-opensource-src-1.0.2.tar.gz (new)
++++++ qt-mobility.yaml
--- qt-mobility.yaml
+++ qt-mobility.yaml
@@ -1,64 +1,220 @@
Name: qt-mobility
-Summary: Qt Mobility APIs
-Version: 1.0.0
+Summary: APIs for mobile device functionality
+Version: 1.0.2
Release: 1
Group: System/Libraries
-License: LGPL v2.1
-URL: http://qt.nokia.com
+License: LGPLv2.1 with exception or GPLv3
+URL: http://qt.gitorious.org/qt-mobility
Sources:
- - "%{name}-%{version}.tar.gz"
+ - http://get.qt.nokia.com/qt/solutions/%{name}-opensource-src-%{version}.tar.gz
Patches:
+ - 02_no_rpath.patch
+ - 04_ftbfs_multimedia_examples.patch
+ - 05_fix_translations_install_path.patch
- qt-enable-playbin2.patch
- - qt-mobility-1.0.0-install-headers-under-QtMobility.patch
- qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
- - qtmobility-qpaintervideosurface.patch
- - fix-sysinfo-compile.patch
- - move-multimedia-out-of-namespace.patch
- - move-bearer-out-of-namespace.patch
- - move-location-out-of-namespace.patch
- - move-publishsubscript-out-of-namespace.patch
- - misc-namespace-fixes.patch
- - fix-install-locations.patch
- - change_qtmedia_export_to_qtmultimedia.patch
- - revert-AspectRatioMode_commit.patch
- - change_QtMedia_to_QtMultimedia.patch
- default_subtitle_loading.patch
+ - add-meego-build-flag.patch
Description: |
- Qt Mobility Project delivers a set of mobile device related APIs to Qt.
- These APIs allow the developer to use these features with ease from one
- framework and apply them to phones, netbooks and non-mobile personal computers.
-
+ 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
+ apply them to phones, netbooks and non-mobile personal computers.
PkgConfigBR:
- - QtCore >= 4.6.0
- - QtDBus
- - QtOpenGL
- - QtMultimedia
- - QtNetwork
- QtGui
- - messageserver #messagingframework
- - gstreamer-0.10 >= 0.10.19
- - gstreamer-base-0.10 >= 0.10.19
- - gstreamer-interfaces-0.10 >= 0.10.19
- - gstreamer-audio-0.10 >= 0.10.19
- - gstreamer-video-0.10 >= 0.10.1
- - xproto
- - xv
+ - QtOpenGL
+ - QtWebKit
+ - alsa
- bluez
+ - contextsubscriber-1.0
+ - gstreamer-plugins-base-0.10
+ - libpulse
+ - qtopiamail
- qttracker
-PkgBR:
- - fdupes
-
-Provides:
- - qt-mobility > 1.0.0beta1
- - qt-mobility < 1.0.0beta1
-Obsoletes:
- - qt-mobility = 1.0.0beta1
-
+ - x11
+ - xext
+ - xv
Configure: none
-Builder: make
+Builder: none
+NoFiles: yes
+RunFdupes: "%{_includedir}"
SubPackages:
- Name: devel
- Summary: Development files for using QtMobility
+ Summary: APIs for mobile device functionality - development files
Group: Development/Libraries
- Description: This package contains the files necessary to develop QtMobility applications
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the development files needed to build Qt applications
+ using Qt Mobility libraries.
+ Requires:
+ - libqtbearer1 = %{version}
+ - libqtcontacts1 = %{version}
+ - libqtlocation1 = %{version}
+ - libqtmessaging1 = %{version}
+ - libqtmultimediakit1 = %{version}
+ - libqtpublishsubscribe1 = %{version}
+ - libqtsensors1 = %{version}
+ - libqtserviceframework1 = %{version}
+ - libqtsysteminfo1 = %{version}
+ - libqtversit1 = %{version}
+
+ - Name: libqtbearer1
+ AsWholeName: yes
+ Summary: Qt Mobility Bearer Management module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains an API to control the system\'s connectivity state.
+
+ - Name: libqtcontacts1
+ AsWholeName: yes
+ Summary: Qt Mobility Contacts module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains an API enabling clients to request contact data from
+ local or remote backends.
+
+ - Name: libqtlocation1
+ AsWholeName: yes
+ Summary: Qt Mobility Location module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Location API. It provides a library for distributing
+ and receiving location data using arbitrary data sources.
+
+ - Name: libqtmessaging1
+ AsWholeName: yes
+ Summary: Qt Mobility Messaging module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Messaging API. It is a common interface for handling
+ SMS, MMS, MIME Email and TNEF Email messages.
+
+ - Name: libqtmultimediakit1
+ AsWholeName: yes
+ Summary: Qt Mobility MultimediaKit module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains a set of APIs to play and record media, and manage a
+ collection of media content.
+
+ - Name: libqtpublishsubscribe1
+ AsWholeName: yes
+ Summary: Qt Mobility Publish and Subscribe module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Publish and Subscribe API (containing Value Space).
+ It enables applications to read item values, navigate through and subscribe to
+ change notifications.
+
+ - Name: libqtsensors1
+ AsWholeName: yes
+ Summary: Qt Mobility Sensors module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains the Sensors API. It provides access to sensors.
+ Requires:
+ - libqtsql4-sqlite
+
+ - Name: libqtserviceframework1
+ AsWholeName: yes
+ Summary: Qt Mobility Service Framework module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains a set of APIs to that allows clients to discover and
+ instantiate arbitrary services.
+
+ - Name: libqtsysteminfo1
+ AsWholeName: yes
+ Summary: Qt Mobility System Information module
+ Group: System/Libraries
+ Description: |
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+
+ This package contains a set of APIs to discover system related information and
+ capabilities.
+
(69 more lines skipped)
++++++ qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
--- qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
+++ qtmobility-GL_CLAMP_TO_EDGE_of_video_texture_diff.patch
@@ -1,8 +1,9 @@
-diff --git a/src/multimedia/qpaintervideosurface.cpp b/src/multimedia/qpaintervideosurface.cpp
-index 7790e3a..a8e0263 100644
+Description: improve video playback performance
+Author: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+
--- a/src/multimedia/qpaintervideosurface.cpp
+++ b/src/multimedia/qpaintervideosurface.cpp
-@@ -345,8 +345,8 @@ QAbstractVideoSurface::Error QVideoSurfaceGLPainter::setCurrentFrame(const QVide
+@@ -330,8 +330,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);
++++++ deleted files:
--- change_QtMedia_to_QtMultimedia.patch
--- change_qtmedia_export_to_qtmultimedia.patch
--- fix-install-locations.patch
--- fix-sysinfo-compile.patch
--- misc-namespace-fixes.patch
--- move-bearer-out-of-namespace.patch
--- move-location-out-of-namespace.patch
--- move-multimedia-out-of-namespace.patch
--- move-publishsubscript-out-of-namespace.patch
--- qt-mobility-1.0.0-install-headers-under-QtMobility.patch
--- qt-mobility-1.0.0.tar.gz
--- qtmobility-qpaintervideosurface.patch
--- revert-AspectRatioMode_commit.patch
More information about the MeeGo-commits
mailing list