[meego-commits] 10636: Changes to Trunk/libqttracker

Rolla Selbak no_reply at build.meego.com
Tue Dec 7 04:01:42 UTC 2010


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

Thank You,
Rolla Selbak

[This message was auto-generated]

---

Request #10636:

  submit:   Trunk:Testing/libqttracker(r15) -> Trunk/libqttracker


Message:
    Trunk promotion

State:   new          2010-12-06T20:01:32 rolla
Comment: None



changes files:
--------------
--- libqttracker.changes
+++ libqttracker.changes
@@ -0,0 +1,11 @@
+* Tue Nov 30 2010 Maitrey Mishra <ext-maitrey.mishra at nokia.com> - 6.12.1
+- Update to upstream, fixes BMC - 10666
+- Adds query sequencer to tracker backend
+- Qttracker does not support EXISTS for limited type verification in queries
+- mafwbackend implicit browse cancel fix
+- Qmafw-gui crashes when exited during non-completed YouTube browse.
+- libqttracker-tests depend on testrunner instead of testrunner-lite
+- Adds RDFVariable::exists and ::notExists
+- mafwbackend serviceIri and some cleanup
+- Returns localDebug, localWarning and localCritical temporarily
+

old:
----
  libqttracker-6.11.0.tar.bz2
  libqttracker-6.8.4-fix-pkgconfig-file.patch

new:
----
  libqttracker-6.12.1-Fix-for-tests.xml.patch
  libqttracker-6.12.1-fixing-make-install.patch
  libqttracker-6.12.1.tar.bz2

spec files:
-----------
--- libqttracker.spec
+++ libqttracker.spec
@@ -1,13 +1,13 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.19
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
 
 Name:       libqttracker
 Summary:    Qt bindings for the Tracker media indexing infrastructure
-Version:    6.11.0
+Version:    6.12.1
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2
@@ -16,12 +16,16 @@
 Source100:  libqttracker.yaml
 Patch0:     libqttracker-6.8.4-build_subdirs_in_order.patch
 Patch1:     libqttracker-6.8.4-disable-testhelper.patch
-Patch2:     libqttracker-6.8.4-fix-pkgconfig-file.patch
+Patch2:     libqttracker-6.12.1-fixing-make-install.patch
+Patch3:     libqttracker-6.12.1-Fix-for-tests.xml.patch
 Requires:   %{name} >= %{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(uuid)
+BuildRequires:  doxygen
+BuildRequires:  tracker >= 0.7.0
 BuildRequires:  fdupes
 
 
@@ -57,8 +61,10 @@
 %patch0 -p1
 # libqttracker-6.8.4-disable-testhelper.patch
 %patch1 -p1
-# libqttracker-6.8.4-fix-pkgconfig-file.patch
+# libqttracker-6.12.1-fixing-make-install.patch
 %patch2 -p1
+# libqttracker-6.12.1-Fix-for-tests.xml.patch
+%patch3 -p1
 # >> setup
 # << setup
 
@@ -66,6 +72,7 @@
 # >> build pre
 %qmake
 make %{?jobs:-j%jobs}
+make doc && make dev-doc
 # << build pre
 
 
@@ -79,7 +86,7 @@
 
 # >> install post
 %qmake_install
-rm -fR %{buildroot}/usr/share/libqttracker-tests
+sed -i 's,-L/home/abuild/[^ ]*,,' %{buildroot}/%{_libdir}/pkgconfig/*.pc
 # << install post
 %fdupes  %{buildroot}/%{_includedir}
 
@@ -110,6 +117,7 @@
 %{_libdir}/libqttracker.prl
 %{_libdir}/pkgconfig/qttracker.pc
 %{_includedir}/QtTracker
+%doc  %{_datadir}/doc/libqttracker-doc/*
 # << files devel
 
 %files tests
@@ -118,5 +126,6 @@
 %{_bindir}/mafwsuite
 %{_bindir}/qttracker-perf-tests
 %{_bindir}/qttracker-unit-tests
+%{_datadir}/libqttracker-tests/*
 # << files tests
 

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

++++++ libqttracker-6.12.1-Fix-for-tests.xml.patch (new)
--- libqttracker-6.12.1-Fix-for-tests.xml.patch
+++ libqttracker-6.12.1-Fix-for-tests.xml.patch
+diff -Naur ../libqttracker-6.12.1//tests/unit-tests/tests.xml libqttracker-6.12.1//tests/unit-tests/tests.xml
+--- ../libqttracker-6.12.1//tests/unit-tests/tests.xml	1970-01-01 02:00:00.000000000 +0200
++++ libqttracker-6.12.1//tests/unit-tests/tests.xml	2010-11-24 10:44:52.000000000 +0200
+@@ -0,0 +1,508 @@
++<testdefinition version="0.1">
++  <suite name="libqttracker-tests">
++    <description />
++    <set name="._qttracker-unit-tests">
++      <description>libqttracker-tests:qttracker-unit-tests</description>
++      <case name="qttracker-unit-tests-UnitSelf">
++        <description>libqttracker-tests:qttracker-unit-tests:UnitSelf</description>
++        <step>/usr/bin/qttracker-unit-tests UnitSelf</step>
++      </case>
++      <case name="qttracker-unit-tests-stress_testTrackerHeavyLoad">
++        <description>libqttracker-tests:qttracker-unit-tests:stress_testTrackerHeavyLoad</description>
++        <step>/usr/bin/qttracker-unit-tests stress_testTrackerHeavyLoad</step>
++      </case>
++      <case name="qttracker-unit-tests-raw_ResourceLifetime">
++        <description>libqttracker-tests:qttracker-unit-tests:raw_ResourceLifetime</description>
++        <step>/usr/bin/qttracker-unit-tests raw_ResourceLifetime</step>
++      </case>
++      <case name="qttracker-unit-tests-base_ResourceLifetime">
++        <description>libqttracker-tests:qttracker-unit-tests:base_ResourceLifetime</description>
++        <step>/usr/bin/qttracker-unit-tests base_ResourceLifetime</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_ResourceLifetime">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_ResourceLifetime</description>
++        <step>/usr/bin/qttracker-unit-tests conv_ResourceLifetime</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_PhoneNumberContains">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_PhoneNumberContains</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_PhoneNumberContains</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_TransactionResources">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_TransactionResources</description>
++        <step>/usr/bin/qttracker-unit-tests conv_TransactionResources</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_RDFVariableLink">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_RDFVariableLink</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_RDFVariableLink</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_RDFProperty">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_RDFProperty</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_RDFProperty</step>
++      </case>
++      <case name="qttracker-unit-tests-base_hasTypeMusicAlbum">
++        <description>libqttracker-tests:qttracker-unit-tests:base_hasTypeMusicAlbum</description>
++        <step>/usr/bin/qttracker-unit-tests base_hasTypeMusicAlbum</step>
++      </case>
++      <case name="qttracker-unit-tests-base_AffilOptionalUnboundUpdate">
++        <description>libqttracker-tests:qttracker-unit-tests:base_AffilOptionalUnboundUpdate</description>
++        <step>/usr/bin/qttracker-unit-tests base_AffilOptionalUnboundUpdate</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_ContactManipulationQuerying">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_ContactManipulationQuerying</description>
++        <step>/usr/bin/qttracker-unit-tests conv_ContactManipulationQuerying</step>
++      </case>
++      <case name="qttracker-unit-tests-domain_Tags">
++        <description>libqttracker-tests:qttracker-unit-tests:domain_Tags</description>
++        <step>/usr/bin/qttracker-unit-tests domain_Tags</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_addHasAffil">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_addHasAffil</description>
++        <step>/usr/bin/qttracker-unit-tests conv_addHasAffil</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_firstHasEmailAddress">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_firstHasEmailAddress</description>
++        <step>/usr/bin/qttracker-unit-tests conv_firstHasEmailAddress</step>
++      </case>
++      <case name="qttracker-unit-tests-base_OrderedModel">
++        <description>libqttracker-tests:qttracker-unit-tests:base_OrderedModel</description>
++        <step>/usr/bin/qttracker-unit-tests base_OrderedModel</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_IMAccountIsBoundNot">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_IMAccountIsBoundNot</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_IMAccountIsBoundNot</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_ContainsEscapeCharacter">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_ContainsEscapeCharacter</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_ContainsEscapeCharacter</step>
++      </case>
++      <case name="qttracker-unit-tests-base_LiveNodeModelRemoveRows">
++        <description>libqttracker-tests:qttracker-unit-tests:base_LiveNodeModelRemoveRows</description>
++        <step>/usr/bin/qttracker-unit-tests base_LiveNodeModelRemoveRows</step>
++      </case>
++      <case name="qttracker-unit-tests-base_LiveNodeModel_wholeIndex">
++        <description>libqttracker-tests:qttracker-unit-tests:base_LiveNodeModel_wholeIndex</description>
++        <step>/usr/bin/qttracker-unit-tests base_LiveNodeModel_wholeIndex</step>
++      </case>
++      <case name="qttracker-unit-tests-base_LiveNodeModel_findColumnsByName">
++        <description>libqttracker-tests:qttracker-unit-tests:base_LiveNodeModel_findColumnsByName</description>
++        <step>/usr/bin/qttracker-unit-tests base_LiveNodeModel_findColumnsByName</step>
++      </case>
++      <case name="qttracker-unit-tests-base_LiveNodeModel_subModel">
++        <description>libqttracker-tests:qttracker-unit-tests:base_LiveNodeModel_subModel</description>
++        <step>/usr/bin/qttracker-unit-tests base_LiveNodeModel_subModel</step>
++      </case>
++      <case name="qttracker-unit-tests-base_SimpleAddCachedObject">
++        <description>libqttracker-tests:qttracker-unit-tests:base_SimpleAddCachedObject</description>
++        <step>/usr/bin/qttracker-unit-tests base_SimpleAddCachedObject</step>
++      </case>
++      <case name="qttracker-unit-tests-base_signalEmission">
++        <description>libqttracker-tests:qttracker-unit-tests:base_signalEmission</description>
++        <step>/usr/bin/qttracker-unit-tests base_signalEmission</step>
++      </case>
++      <case name="qttracker-unit-tests-base_setMultipleTimes">
++        <description>libqttracker-tests:qttracker-unit-tests:base_setMultipleTimes</description>
++        <step>/usr/bin/qttracker-unit-tests base_setMultipleTimes</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_sequentialAddContainsBookmarkFolder">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_sequentialAddContainsBookmarkFolder</description>
++        <step>/usr/bin/qttracker-unit-tests conv_sequentialAddContainsBookmarkFolder</step>
++      </case>
++      <case name="qttracker-unit-tests-base_LiveNodesNodesAccess">
++        <description>libqttracker-tests:qttracker-unit-tests:base_LiveNodesNodesAccess</description>
++        <step>/usr/bin/qttracker-unit-tests base_LiveNodesNodesAccess</step>
++      </case>
++      <case name="qttracker-unit-tests-base_selectUrnFilteredPhotos">
++        <description>libqttracker-tests:qttracker-unit-tests:base_selectUrnFilteredPhotos</description>
++        <step>/usr/bin/qttracker-unit-tests base_selectUrnFilteredPhotos</step>
++      </case>
++      <case name="qttracker-unit-tests-base_addRowsToModel">
++        <description>libqttracker-tests:qttracker-unit-tests:base_addRowsToModel</description>
++        <step>/usr/bin/qttracker-unit-tests base_addRowsToModel</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_queryContactAndMinProperties">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_queryContactAndMinProperties</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_queryContactAndMinProperties</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_setAffilTitle">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_setAffilTitle</description>
++        <step>/usr/bin/qttracker-unit-tests conv_setAffilTitle</step>
++      </case>
++      <case name="qttracker-unit-tests-base_aggregateModelVariables">
++        <description>libqttracker-tests:qttracker-unit-tests:base_aggregateModelVariables</description>
++        <step>/usr/bin/qttracker-unit-tests base_aggregateModelVariables</step>
++      </case>
++      <case name="qttracker-unit-tests-base_childModels">
++        <description>libqttracker-tests:qttracker-unit-tests:base_childModels</description>
++        <step>/usr/bin/qttracker-unit-tests base_childModels</step>
++      </case>
++      <case name="qttracker-unit-tests-base_setDataTest">
++        <description>libqttracker-tests:qttracker-unit-tests:base_setDataTest</description>
++        <step>/usr/bin/qttracker-unit-tests base_setDataTest</step>
++      </case>
++      <case name="qttracker-unit-tests-base_testDummyModel">
++        <description>libqttracker-tests:qttracker-unit-tests:base_testDummyModel</description>
++        <step>/usr/bin/qttracker-unit-tests base_testDummyModel</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_contentLastModified">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_contentLastModified</description>
++        <step>/usr/bin/qttracker-unit-tests conv_contentLastModified</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_testFileLastAccessed">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_testFileLastAccessed</description>
++        <step>/usr/bin/qttracker-unit-tests conv_testFileLastAccessed</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_isZeroOrDoesntExist">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_isZeroOrDoesntExist</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_isZeroOrDoesntExist</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_optionalChildOfLink">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_optionalChildOfLink</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_optionalChildOfLink</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_messagingSubQuery">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_messagingSubQuery</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_messagingSubQuery</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_messagecountSubQuery">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_messagecountSubQuery</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_messagecountSubQuery</step>
++      </case>
++      <case name="qttracker-unit-tests-base_liveQuery">
++        <description>libqttracker-tests:qttracker-unit-tests:base_liveQuery</description>
++        <step>/usr/bin/qttracker-unit-tests base_liveQuery</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_SubQueryCrash">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_SubQueryCrash</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_SubQueryCrash</step>
++      </case>
++      <case name="qttracker-unit-tests-base_modelUpdatedSignal">
++        <description>libqttracker-tests:qttracker-unit-tests:base_modelUpdatedSignal</description>
++        <step>/usr/bin/qttracker-unit-tests base_modelUpdatedSignal</step>
++      </case>
++      <case name="qttracker-unit-tests-conv_wildcardPropertyRemove">
++        <description>libqttracker-tests:qttracker-unit-tests:conv_wildcardPropertyRemove</description>
++        <step>/usr/bin/qttracker-unit-tests conv_wildcardPropertyRemove</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_unionChildren">
++        <description>libqttracker-tests:qttracker-unit-tests:unbound_unionChildren</description>
++        <step>/usr/bin/qttracker-unit-tests unbound_unionChildren</step>
++      </case>
++      <case name="qttracker-unit-tests-base_modelTests">
++        <description>libqttracker-tests:qttracker-unit-tests:base_modelTests</description>
++        <step>/usr/bin/qttracker-unit-tests base_modelTests</step>
++      </case>
++      <case name="qttracker-unit-tests-unbound_nonColumnOrderBy">
(314 more lines skipped)

++++++ libqttracker-6.12.1-fixing-make-install.patch (new)
--- libqttracker-6.12.1-fixing-make-install.patch
+++ libqttracker-6.12.1-fixing-make-install.patch
+diff -Naur ../libqttracker-6.12.1//doc/doc.pri libqttracker-6.12.1//doc/doc.pri
+--- ../libqttracker-6.12.1//doc/doc.pri	2010-11-15 17:03:17.000000000 +0200
++++ libqttracker-6.12.1//doc/doc.pri	2010-11-26 09:08:19.580184001 +0200
+@@ -2,8 +2,8 @@
+ doxygen_doc.commands = cd doc && VERSION=\"$$VERSION\" LIBRARYNAME=\"$$LIBRARYNAME\" doxygen doxygen.cfg
+ doc.depends = doxygen_doc
+ 
+-install_doc.files = doc/html
+-install_doc.path = $$PREFIX/share/doc/$$PACKAGENAME-doc/
++install_doc.files = doc/html/*
++install_doc.path = $$PREFIX/share/doc/$$PACKAGENAME-doc/*
+ install_doc.CONFIG = no_check_exist
+ INSTALLS += install_doc
+ 

++++++ libqttracker-6.11.0.tar.bz2 -> libqttracker-6.12.1.tar.bz2
43289 lines of diff (skipped)

++++++ libqttracker.yaml
--- libqttracker.yaml
+++ libqttracker.yaml
@@ -1,6 +1,6 @@
 Name: libqttracker
 Summary: Qt bindings for the Tracker media indexing infrastructure
-Version: 6.11.0
+Version: 6.12.1
 Release: 1
 Group: System/Libraries
 License: LGPLv2
@@ -10,13 +10,18 @@
 Patches:
     - libqttracker-6.8.4-build_subdirs_in_order.patch
     - libqttracker-6.8.4-disable-testhelper.patch
-    - libqttracker-6.8.4-fix-pkgconfig-file.patch
+    - libqttracker-6.12.1-fixing-make-install.patch
+    - libqttracker-6.12.1-Fix-for-tests.xml.patch
 Requires:
     - "%{name} >= %{version}"
 Description: |
     Qt Tracker is a Qt client library for accessing Tracker.
+PkgBR:
+    - doxygen
+    - tracker >= 0.7.0
 PkgConfigBR:
     - QtGui
+    - QtCore
     - uuid
 Configure: none
 Builder: none

++++++ deleted files:
--- libqttracker-6.8.4-fix-pkgconfig-file.patch




More information about the MeeGo-commits mailing list