Why don't use use %qmake aned %qmake_install that's already there? And 10666 is NOT marked as Resolved.
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Mishra Maitrey > Sent: Tuesday, November 30, 2010 11:52 PM > To: [email protected] > Subject: [meego-commits] 10441: Changes to Trunk:Testing/libqttracker > > Hi, > I have made the following changes to libqttracker in project Trunk:Testing. > Please review and accept ASAP. > > Thank You, > Mishra Maitrey > > [This message was auto-generated] > > --- > > Request #10441: > > submit: devel:contentfw/libqttracker(r22) -> Trunk:Testing/libqttracker > > > Message: > Updated to upstream versions, Fixes BMC - 10666 > * Tue Nov 30 2010 Maitrey Mishra <[email protected]> - 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 > > State: new 2010-11-30T07:52:13 maimishr > Comment: None > > > > changes files: > -------------- > --- libqttracker.changes > +++ libqttracker.changes > @@ -0,0 +1,11 @@ > +* Tue Nov 30 2010 Maitrey Mishra <[email protected]> - 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,15 +61,18 @@ > %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 > > %build > # >> build pre > -%qmake > +qmake -r PREFIX=/usr > make %{?jobs:-j%jobs} > +make doc && make dev-doc > # << build pre > > > @@ -78,8 +85,8 @@ > # << install pre > > # >> install post > -%qmake_install > -rm -fR %{buildroot}/usr/share/libqttracker-tests > +%make_install > +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_testTrackerHeavyL > oad</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</d > escription> > ++ <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</d > escription> > ++ <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</d > escription> > ++ <step>/usr/bin/qttracker-unit-tests > conv_ResourceLifetime</step> > ++ </case> > ++ <case > name="qttracker-unit-tests-unbound_PhoneNumberContains"> > ++ > <description>libqttracker-tests:qttracker-unit-tests:unbound_PhoneNumberCo > ntains</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_TransactionResource > s</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</d > escription> > ++ <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_AffilOptionalUnboun > dUpdate</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_ContactManipulation > Querying</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</descrip > tion> > ++ <step>/usr/bin/qttracker-unit-tests conv_addHasAffil</step> > ++ </case> > ++ <case name="qttracker-unit-tests-conv_firstHasEmailAddress"> > ++ > <description>libqttracker-tests:qttracker-unit-tests:conv_firstHasEmailAddres > s</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</des > cription> > ++ <step>/usr/bin/qttracker-unit-tests base_OrderedModel</step> > ++ </case> > ++ <case > name="qttracker-unit-tests-unbound_IMAccountIsBoundNot"> > ++ > <description>libqttracker-tests:qttracker-unit-tests:unbound_IMAccountIsBou > ndNot</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_ContainsEscape > Character</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_LiveNodeModelRem > oveRows</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_who > leIndex</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_find > ColumnsByName</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_sub > Model</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_SimpleAddCachedOb > ject</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</des > cription> > ++ <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</d > escription> > ++ <step>/usr/bin/qttracker-unit-tests > base_setMultipleTimes</step> > ++ </case> > ++ <case > name="qttracker-unit-tests-conv_sequentialAddContainsBookmarkFolder"> > ++ > <description>libqttracker-tests:qttracker-unit-tests:conv_sequentialAddContai > nsBookmarkFolder</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_LiveNodesNodesAcc > ess</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_selectUrnFilteredPho > tos</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_queryContactAn > dMinProperties</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</descrip > tion> > ++ <step>/usr/bin/qttracker-unit-tests conv_setAffilTitle</step> > ++ </case> > ++ <case name="qttracker-unit-tests-base_aggregateModelVariables"> > ++ > <description>libqttracker-tests:qttracker-unit-tests:base_aggregateModelVari > ables</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</descri > ption> > ++ <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</descri > ption> > ++ <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_isZeroOrDoesntE > xist</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_optionalChildOfLi > nk</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_messagingSubQu > ery</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_messagecountSu > bQuery</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</descripti > on> > ++ <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_wildcardPropertyRe > move</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</d > escription> > ++ <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</descrip > tion> > ++ <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 > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
