I have made the following changes intended for : CE:MW:Shared / grilo-plugins CE:MW:Shared / libqtsparql CE:MW:Shared / qtcontacts-tracker CE:MW:Shared / contactsd CE:MW:Shared / libcommhistory CE:MW:Shared / tracker
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7062 Thank You, msameer [This message was auto-generated] --- Request # 7062: Messages from BOSS: State: review at 2012-10-17T13:07:57 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:msameer:branches:CE:MW:Shared / grilo-plugins -> CE:MW:Shared / grilo-plugins changes files: -------------- --- grilo-plugins.changes +++ grilo-plugins.changes @@ -0,0 +1,3 @@ +* Mon Oct 15 2012 Mohammed Hassan <[email protected]> - 0.2.2 +- requires tracker-sparql-0.14 for building against tracker 0.14.2 + spec files: ----------- --- grilo-plugins.spec +++ grilo-plugins.spec @@ -8,7 +8,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/grilo-plugins/0.2/grilo-plugins-%{version}.tar.xz BuildRequires: pkgconfig(grilo-0.2) BuildRequires: pkgconfig(grilo-net-0.2) -BuildRequires: pkgconfig(tracker-sparql-0.10) +BuildRequires: pkgconfig(tracker-sparql-0.14) BuildRequires: pkgconfig(libgdata) BuildRequires: pkgconfig(libquvi) BuildRequires: pkgconfig(sqlite3) other changes: -------------- submit: home:msameer:branches:CE:MW:Shared / libqtsparql -> CE:MW:Shared / libqtsparql changes files: -------------- --- libqtsparql.changes +++ libqtsparql.changes @@ -0,0 +1,3 @@ +* Mon Oct 15 2012 Mohammed Hassan <[email protected]> - 0.2.1 +- Added 0002-fix-compile-against-newer-tracker.patch (Written by Jens Georg) + new: ---- 0002-fix-compile-against-newer-tracker.patch spec files: ----------- --- libqtsparql.spec +++ libqtsparql.spec @@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch0: 0001-Fix-for-tests-xml.patch Patch1: compile-fix-with-qt-4.8.patch +Patch2: 0002-fix-compile-against-newer-tracker.patch BuildRequires: doxygen BuildRequires: pkgconfig(QtCore) BuildRequires: tracker-devel @@ -62,6 +63,7 @@ %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build ./configure -prefix /usr other changes: -------------- ++++++ 0002-fix-compile-against-newer-tracker.patch (new) --- 0002-fix-compile-against-newer-tracker.patch +++ 0002-fix-compile-against-newer-tracker.patch @@ -0,0 +1,45 @@ +diff -ruN libqtsparql-0.2.1/config.tests/unix/tracker-sparql/tracker-sparql.pro libqtsparql-0.2.1-patched/config.tests/unix/tracker-sparql/tracker-sparql.pro +--- libqtsparql-0.2.1/config.tests/unix/tracker-sparql/tracker-sparql.pro 2011-09-08 11:44:10.000000000 +0000 ++++ libqtsparql-0.2.1-patched/config.tests/unix/tracker-sparql/tracker-sparql.pro 2012-09-29 11:24:10.538561361 +0000 +@@ -3,5 +3,5 @@ + + unix: { + CONFIG += link_pkgconfig +- PKGCONFIG += tracker-sparql-0.10 ++ PKGCONFIG += tracker-sparql-0.14 + } +diff -ruN libqtsparql-0.2.1/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro libqtsparql-0.2.1-patched/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro +--- libqtsparql-0.2.1/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro 2011-09-08 11:44:10.000000000 +0000 ++++ libqtsparql-0.2.1-patched/src/plugins/sparqldrivers/tracker_direct/tracker_direct.pro 2012-09-29 11:48:06.590594130 +0000 +@@ -16,7 +16,7 @@ + + unix: { + CONFIG += link_pkgconfig +- PKGCONFIG += tracker-sparql-0.10 ++ PKGCONFIG += tracker-sparql-0.14 + } + + include(../qsparqldriverbase.pri) +diff -ruN libqtsparql-0.2.1/src/sparql/drivers/drivers.pri libqtsparql-0.2.1-patched/src/sparql/drivers/drivers.pri +--- libqtsparql-0.2.1/src/sparql/drivers/drivers.pri 2011-09-08 11:44:10.000000000 +0000 ++++ libqtsparql-0.2.1-patched/src/sparql/drivers/drivers.pri 2012-09-29 11:47:39.182593503 +0000 +@@ -25,7 +25,7 @@ + drivers/tracker_direct/qsparql_tracker_direct_sync_result_p.cpp \ + drivers/tracker_direct/qsparql_tracker_direct_update_result_p.cpp + CONFIG += no_keywords link_pkgconfig +- PKGCONFIG += tracker-sparql-0.10 ++ PKGCONFIG += tracker-sparql-0.14 + DEFINES += QT_SPARQL_TRACKER_DIRECT + } + +diff -ruN libqtsparql-0.2.1/tests/auto/qsparql_benchmark/qsparql_benchmark.pro libqtsparql-0.2.1-patched/tests/auto/qsparql_benchmark/qsparql_benchmark.pro +--- libqtsparql-0.2.1/tests/auto/qsparql_benchmark/qsparql_benchmark.pro 2011-09-08 11:44:10.000000000 +0000 ++++ libqtsparql-0.2.1-patched/tests/auto/qsparql_benchmark/qsparql_benchmark.pro 2012-09-29 11:52:34.806600250 +0000 +@@ -1,6 +1,6 @@ + include(../sparqltest.pri) + CONFIG += qt warn_on console depend_includepath testcase link_pkgconfig +-PKGCONFIG = tracker-sparql-0.10 ++PKGCONFIG = tracker-sparql-0.14 + QT += testlib xml + SOURCES += tst_qsparql_benchmark.cpp + submit: home:msameer:branches:CE:MW:Shared / qtcontacts-tracker -> CE:MW:Shared / qtcontacts-tracker changes files: -------------- --- qtcontacts-tracker.changes +++ qtcontacts-tracker.changes @@ -0,0 +1,4 @@ +* Mon Oct 15 2012 Mohammed Hassan <[email protected]> - 4.19.2 +- Added qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch (Written by Jens Georg) +- Added qtcontacts-tracker-4.19.2-no-su-for-tests.patch + new: ---- qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch qtcontacts-tracker-4.19.2-no-su-for-tests.patch spec files: ----------- --- qtcontacts-tracker.spec +++ qtcontacts-tracker.spec @@ -21,6 +21,8 @@ Patch2: qtcontacts-tracker-4.19.2-fix-broken-docs-check-we-don-t-want-them.patch Patch3: qtcontacts-tracker-4.19.2-fix-field-extended-address-reference.patch Patch4: 0001-Fix-QObject-thread-ownership-issues.patch +Patch5: qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch +Patch6: qtcontacts-tracker-4.19.2-no-su-for-tests.patch Requires: libqtsparql-tracker >= 0.0.18 Requires: libqtsparql-tracker-direct BuildRequires: pkgconfig(QtContacts) >= 1.2 @@ -92,6 +94,10 @@ %patch3 -p1 # 0001-Fix-QObject-thread-ownership-issues.patch %patch4 -p1 +# qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch +%patch5 -p1 +# qtcontacts-tracker-4.19.2-no-su-for-tests.patch +%patch6 -p1 # >> setup # << setup other changes: -------------- ++++++ qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch (new) --- qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch +++ qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch @@ -0,0 +1,12 @@ +diff -ruN qtcontacts-tracker-4.19.2.orig/src/engine/engine.pro qtcontacts-tracker-4.19.2/src/engine/engine.pro +--- qtcontacts-tracker-4.19.2.orig/src/engine/engine.pro 2012-03-20 10:21:38.000000000 +0000 ++++ qtcontacts-tracker-4.19.2/src/engine/engine.pro 2012-09-29 12:32:51.398655393 +0000 +@@ -22,7 +22,7 @@ + + include(../common.pri) + +-QMAKE_CXXFLAGS *= $$system(pkg-config --cflags-only-I tracker-sparql-0.10) ++QMAKE_CXXFLAGS *= $$system(pkg-config --cflags-only-I tracker-sparql-0.14) + + TEMPLATE = lib + CONFIG += mobility staticlib plugin create_prl qtsparql ++++++ qtcontacts-tracker-4.19.2-no-su-for-tests.patch (new) --- qtcontacts-tracker-4.19.2-no-su-for-tests.patch +++ qtcontacts-tracker-4.19.2-no-su-for-tests.patch @@ -0,0 +1,23 @@ +diff -Naur qtcontacts-tracker-4.19.2.orig/tests/mktests.sh qtcontacts-tracker-4.19.2/tests/mktests.sh +--- qtcontacts-tracker-4.19.2.orig/tests/mktests.sh 2012-03-20 12:21:38.000000000 +0200 ++++ qtcontacts-tracker-4.19.2/tests/mktests.sh 2012-10-16 16:59:37.000000000 +0300 +@@ -113,7 +113,6 @@ + then + bindir="$topbuilddir/tests/$suite" + else +- pre_steps="su -l user -c '$pre_steps'" + bindir="/usr/bin" + fi + +@@ -139,11 +138,6 @@ + + step="${environ}${environ:+ }${launcher}${bindir}/${suite} -maxwarnings 0 ${test}" + +- if test "$enable_local" != "yes" +- then +- step="su -l user -c '$step'" +- fi +- + category=`sed -ne "s/^$suite::$test:\s*\(\<\w\+\>\).*/\1/p" $topsourcedir/tests/timeouts` + + case "$category" in ++++++ qtcontacts-tracker.yaml --- qtcontacts-tracker.yaml +++ qtcontacts-tracker.yaml @@ -13,6 +13,8 @@ - qtcontacts-tracker-4.19.2-fix-broken-docs-check-we-don-t-want-them.patch - qtcontacts-tracker-4.19.2-fix-field-extended-address-reference.patch - 0001-Fix-QObject-thread-ownership-issues.patch + - qtcontacts-tracker-4.19.2-compile-against-tracker-0.14.patch + - qtcontacts-tracker-4.19.2-no-su-for-tests.patch Description: QtContact tracker storage plugin. Requires: submit: home:msameer:branches:CE:MW:Shared / contactsd -> CE:MW:Shared / contactsd changes files: -------------- --- contactsd.changes +++ contactsd.changes @@ -0,0 +1,4 @@ +* Mon Oct 15 2012 Mohammed Hassan <[email protected]> - 1.1.1 +- requires tracker-sparql-0.14 for building against tracker 0.14.2 +- Added Jens Georg's patch (0001-compile-against-tracker-0-14.patch) + new: ---- 0001-compile-against-tracker-0-14.patch spec files: ----------- --- contactsd.spec +++ contactsd.spec @@ -12,11 +12,12 @@ Patch0: 0001-Move-tests-according-to-Mer-packaging-guidelines.patch Patch1: 0001-Fix-header-path-for-new-versions-of-telepathy-qt4.patch Patch2: 0001-Use-mlocale-instead-of-meegotouch-for-birthday-plugi.patch +Patch3: 0001-compile-against-tracker-0-14.patch BuildRequires: pkgconfig(qmsystem2) BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtSparql) BuildRequires: pkgconfig(QtSparqlTrackerExtensions) -BuildRequires: pkgconfig(tracker-sparql-0.10) +BuildRequires: pkgconfig(tracker-sparql-0.14) BuildRequires: pkgconfig(TelepathyQt4) BuildRequires: pkgconfig(QtContacts) BuildRequires: pkgconfig(cubi-0.1) @@ -76,7 +77,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 - +%patch3 -p1 %build ./configure --bindir %{_bindir} --libdir %{_libdir} --includedir %{_includedir} other changes: -------------- ++++++ 0001-compile-against-tracker-0-14.patch (new) --- 0001-compile-against-tracker-0-14.patch +++ 0001-compile-against-tracker-0-14.patch @@ -0,0 +1,12 @@ +diff -ruN contactsd-1.1.1.orig/plugins/telepathy/telepathy.pro contactsd-1.1.1/plugins/telepathy/telepathy.pro +--- contactsd-1.1.1.orig/plugins/telepathy/telepathy.pro 2012-02-14 14:49:58.000000000 +0000 ++++ contactsd-1.1.1/plugins/telepathy/telepathy.pro 2012-09-29 13:45:33.430754921 +0000 +@@ -33,7 +33,7 @@ + } + + CONFIG += link_pkgconfig +-PKGCONFIG += TelepathyQt4 tracker-sparql-0.10 ++PKGCONFIG += TelepathyQt4 tracker-sparql-0.14 + DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII + + INCLUDEPATH += $$TOP_SOURCEDIR/src submit: home:msameer:branches:CE:MW:Shared / libcommhistory -> CE:MW:Shared / libcommhistory changes files: -------------- --- libcommhistory.changes +++ libcommhistory.changes @@ -0,0 +1,4 @@ +* Mon Oct 15 2012 Mohammed Hassan <[email protected]> - 1.4.1 +- requires tracker-sparql-0.14 for building against tracker 0.14.2 +- Added Jens Georg's patch (libcommhistory-1.4.0-build-against-tracker-0-14.patch) + new: ---- libcommhistory-1.4.0-build-against-tracker-0-14.patch spec files: ----------- --- libcommhistory.spec +++ libcommhistory.spec @@ -7,11 +7,12 @@ URL: https://github.com/nemomobile/libcommhistory Source0: %{name}-%{version}.tar.bz2 Patch0: libcommhistory-1.3.12.6-fix-shared-static-lib-build-order.patch +Patch1: libcommhistory-1.4.0-build-against-tracker-0-14.patch BuildRequires: libqtcontacts-tracker-extensions-devel BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtContacts) BuildRequires: pkgconfig(QtSparql) -BuildRequires: pkgconfig(tracker-sparql-0.10) +BuildRequires: pkgconfig(tracker-sparql-0.14) BuildRequires: pkgconfig(QtDeclarative) %description @@ -61,6 +62,7 @@ %setup -q -n %{name} %patch0 -p1 +%patch1 -p1 %build unset LD_AS_NEEDED other changes: -------------- ++++++ libcommhistory-1.4.0-build-against-tracker-0-14.patch (new) --- libcommhistory-1.4.0-build-against-tracker-0-14.patch +++ libcommhistory-1.4.0-build-against-tracker-0-14.patch @@ -0,0 +1,34 @@ +diff -ruN libcommhistory/src/commhistory.pc libcommhistory.patched/src/commhistory.pc +--- libcommhistory/src/commhistory.pc 2012-09-20 22:21:47.000000000 +0000 ++++ libcommhistory.patched/src/commhistory.pc 2012-09-29 14:04:07.626780343 +0000 +@@ -10,5 +10,5 @@ + Libs: -L${libdir} -lcommhistory + Libs.private: -L/usr/lib + Cflags: -I${includedir} +-Requires: QtCore, QtSparql, tracker-sparql-0.10 ++Requires: QtCore, QtSparql, tracker-sparql-0.14 + +diff -ruN libcommhistory/src/shared.pro libcommhistory.patched/src/shared.pro +--- libcommhistory/src/shared.pro 2012-09-20 22:21:47.000000000 +0000 ++++ libcommhistory.patched/src/shared.pro 2012-09-29 14:04:18.154780587 +0000 +@@ -42,7 +42,7 @@ + qtsparql \ + qtcontacts_extensions_tracker + MOBILITY += contacts +-PKGCONFIG += tracker-sparql-0.10 ++PKGCONFIG += tracker-sparql-0.14 + DEFINES += LIBCOMMHISTORY_SHARED + QMAKE_CXXFLAGS += -fvisibility=hidden + +diff -ruN libcommhistory/src/static.pro libcommhistory.patched/src/static.pro +--- libcommhistory/src/static.pro 2012-09-20 22:21:47.000000000 +0000 ++++ libcommhistory.patched/src/static.pro 2012-09-29 14:03:41.022779737 +0000 +@@ -25,7 +25,7 @@ + + TEMPLATE = lib + CONFIG += qdbus static mobility debug qtsparql qtcontacts_extensions_tracker +-PKGCONFIG += tracker-sparql-0.10 ++PKGCONFIG += tracker-sparql-0.14 + MOBILITY += contacts + VERSION = $$LIBRARY_VERSION + TARGET = commhistory submit: home:msameer:branches:CE:MW:Shared / tracker -> CE:MW:Shared / tracker changes files: -------------- --- tracker.changes +++ tracker.changes @@ -0,0 +1,7 @@ +* Mon Oct 15 2012 Mohammed Hassan <[email protected]> - 0.14.2 +- Updated to latest upstream +- Added dbus-python as a build requirement (Seems needed for tests somehow) +- Enable libvorbis support +- run glib-compile-schemas to compile GSettings schemas +- enable tracker-fts by default + old: ---- tracker-0.10.37.tar.xz new: ---- tracker-0.14.2.tar.xz spec files: ----------- --- tracker.spec +++ tracker.spec @@ -10,12 +10,12 @@ # << macros Summary: An object database, tag/metadata database, search tool and indexer -Version: 0.10.37 +Version: 0.14.2 Release: 1 Group: Data Management/Content Framework License: GPLv2+ URL: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.10/%{name}-%{version}.tar.xz +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.14/%{name}-%{version}.tar.xz Source1: tracker-rpmlintrc Source2: tracker-store.service Source3: tracker-miner-fs.service @@ -65,6 +65,7 @@ BuildRequires: pygobject2 BuildRequires: python >= 2.6 BuildRequires: qt-devel +BuildRequires: dbus-python BuildRequires: fdupes %description @@ -161,7 +162,9 @@ --enable-maemo \ --enable-guarantee-metadata \ --with-unicode-support=libicu \ - --disable-tracker-needle + --disable-tracker-needle \ + --enable-libvorbis \ + --enable-tracker-fts make %{?jobs:-j%jobs} @@ -187,9 +190,17 @@ %find_lang %{name} %fdupes %{buildroot}/%{_datadir}/ -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +# >> post +glib-compile-schemas /usr/share/glib-2.0/schemas/ +# << post + +%postun +/sbin/ldconfig +# >> postun +glib-compile-schemas /usr/share/glib-2.0/schemas/ +# << postun %files -f %{name}.lang %defattr(-,root,root,-) @@ -198,13 +209,13 @@ %{_bindir}/tracker-control %{_datadir}/dbus-1/services/* %{_datadir}/man/man1/* -%{_datadir}/man/man5/* %{_datadir}/tracker/*.xml %{_datadir}/tracker/languages/* %{_datadir}/tracker/miners/* %{_datadir}/tracker/ontologies/* %{_datadir}/vala/vapi/* -%{_libdir}/libtracker-client-*.so* +%{_datadir}/tracker/extract-rules/* +%{_datadir}/glib-2.0/schemas/*.xml %{_libdir}/libtracker-extract-*.so* %{_libdir}/libtracker-miner-*.so* %{_libdir}/libtracker-sparql-*.so* @@ -225,6 +236,7 @@ %defattr(-,root,root,-) # >> files tests %{_datadir}/tracker-tests/* +%{_sysconfdir}/dconf/profile/trackertest # << files tests %files utils @@ -241,7 +253,6 @@ %files devel %defattr(-,root,root,-) # >> files devel -%{_includedir}/tracker-*/libtracker-client/*.h %{_includedir}/tracker-*/libtracker-extract/*.h %{_includedir}/tracker-*/libtracker-miner/*.h %{_includedir}/tracker-*/libtracker-sparql/*.h other changes: -------------- ++++++ tracker-0.14.2.tar.xz (new) ++++++ tracker.yaml --- tracker.yaml +++ tracker.yaml @@ -1,12 +1,12 @@ Name: tracker Summary: An object database, tag/metadata database, search tool and indexer -Version: 0.10.37 +Version: 0.14.2 Release: 1 Group: Data Management/Content Framework License: GPLv2+ URL: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/ Sources: - - http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.10/%{name}-%{version}.tar.xz + - http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.14/%{name}-%{version}.tar.xz - tracker-rpmlintrc Patches: - 0001-Tracker-0.7.23-desktop-files.patch @@ -48,6 +48,7 @@ - pygobject2 - python >= 2.6 - qt-devel + - dbus-python PkgConfigBR: - dbus-glib-1 >= 0.60 - enca @@ -89,6 +90,8 @@ - --enable-guarantee-metadata - --with-unicode-support=libicu - --disable-tracker-needle + - --enable-libvorbis + - --enable-tracker-fts Builder: make LocaleName: "%{name}" RunFdupes: ++++++ deleted files: --- tracker-0.10.37.tar.xz
