Hi Bustany, Please use "osc branch Trunk:Testing qtcontacts-trakcker" to create a branched home project of home:abustany:branches:Trunk:Testing and work there and then submit changes to T:T from branched home project.
For general packaging guideline, please read below two links: http://wiki.meego.com/Release_Engineering/Submission_Checklist http://wiki.meego.com/Packaging/Guidelines Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Adrien Bustany > Sent: Tuesday, December 07, 2010 4:03 PM > To: [email protected] > Subject: [meego-commits] 10648: Changes to Trunk:Testing/qtcontacts-tracker > > Hi, > I have made the following changes to qtcontacts-tracker in project > Trunk:Testing. Please review and accept ASAP. > > Thank You, > Adrien Bustany > > [This message was auto-generated] > > --- > > Request #10648: > > submit: home:abustany/qtcontacts-tracker-testing(r2) -> > Trunk:Testing/qtcontacts-tracker > > > Message: > * Mon Nov 29 2010 Adrien Bustany <[email protected]> - > 4.10.91.3 > - Fixed: BMC#8621 - Require Tracker at runtime > - Fixed: BMC#10664 - Upgrade to upstream version 4.10.91-3 > - Disable build of schemalister since it requires DBus at build time. > - Add patch to follow new libqtsparql-tracker-extensions header location > - Add Requires on libqtsparql-tracker > > State: new 2010-12-07T00:03:07 abustany > Comment: None > > > > changes files: > -------------- > --- qtcontacts-tracker.changes > +++ qtcontacts-tracker.changes > @@ -0,0 +1,7 @@ > +* Mon Nov 29 2010 Adrien Bustany <[email protected]> - 4.10.91.3 > +- Fixed: BMC#8621 - Require Tracker at runtime > +- Fixed: BMC#10664 - Upgrade to upstream version 4.10.91-3 > +- Disable build of schemalister since it requires DBus at build time. > +- Add patch to follow new libqtsparql-tracker-extensions header location > +- Add Requires on libqtsparql-tracker > + > > old: > ---- > qtcontacts-tracker-4.9.4.tar.bz2 > qtcontacts-tracker.yaml > > new: > ---- > 0001-Changes-Update-header-location-for-TrackerChangeList.patch > qt-contacts-tracker-disable-schemalister.patch > qtcontacts-tracker-4.10.91.3.tar.bz2 > > spec files: > ----------- > --- qtcontacts-tracker.spec > +++ qtcontacts-tracker.spec > @@ -1,90 +1,114 @@ > -# > -# Do not Edit! Generated by: > -# spectacle version 0.18 > -# > -# >> macros > -# << macros > - > Name: qtcontacts-tracker > Summary: QtContact tracker storage plugin > -Version: 4.9.4 > +Version: 4.10.91.3 > Release: 1 > Group: System/Libraries > License: LGPL v2.1 > -URL: http://qt.nokia.com > +URL: http://gitorious.org/qtcontacts-tracker > Source0: %{name}-%{version}.tar.bz2 > -Source100: qtcontacts-tracker.yaml > + > +# Building the schema doc requires a DBus connection with a running Tracker > +# instance, which we can't require, so we disable this tool. > +Patch0:qt-contacts-tracker-disable-schemalister.patch > + > +# Header location is already changed in meego package but not yet upstream. > +Patch1:0001-Changes-Update-header-location-for-TrackerChangeList.patch > + > BuildRequires: pkgconfig(QtCore) >= 4.6.0 > BuildRequires: pkgconfig(QtDBus) > -BuildRequires: pkgconfig(QtOpenGL) > -BuildRequires: pkgconfig(QtNetwork) > BuildRequires: pkgconfig(QtGui) > -BuildRequires: pkgconfig(qttracker) > -BuildRequires: qt-mobility-devel > +BuildRequires: libqttracker-devel >= 6.12.1 > +BuildRequires: libqtsparql-devel >= 0.0.12 > +BuildRequires: qt-mobility-devel >= 1.1 > +BuildRequires: libqtsparql-tracker-extensions-devel >= 0.0.3 > BuildRequires: fdupes > +Requires: tracker >= 0.9.18 > +Requires: libqtsparql-tracker >= 0.0.12 > > > %description > QtContact tracker storage plugin > > - > - > %package tests > Summary: Tests for QtContact tracker storage plugin > Group: Development/Libraries > Requires: %{name} = %{version}-%{release} > > %description tests > -Tests package for QtContact tracker storage plugin > +Tests package for QtContact tracker storage plugin. > > +%package benchmarks > +Summary: Benchmarks for QtContact tracker storage plugin > +Group: Development/Libraries > +Requires: %{name} = %{version}-%{release} > > -%prep > -%setup -q -n %{name}-%{version} > - > -# >> setup > -# << setup > +%description benchmarks > +Benchmarks package for QtContact tracker storage plugin. > > -%build > -# >> build pre > -qmake install_prefix=/usr > -# << build pre > +%package -n libqtcontacts-tracker-extensions > +Summary: Specific QContact extensions from qtcontacts-tracker > +Group: Development/Libraries > +Requires: %{name} = %{version}-%{release} > +Requires(post): /sbin/ldconfig > +Requires(postun): /sbin/ldconfig > > +%description -n libqtcontacts-tracker-extensions > +The qtcontacts-tracker-extensions provides additionnal functions and > +constants used by qtcontacts-tracker, but not part of the official QContact > API. > > -make %{?jobs:-j%jobs} > +%package -n libqtcontacts-tracker-extensions-devel > +Summary: Development files for libqtcontacts-tracker-extensions > +Group: Development/Libraries > +Requires: libqtcontacts-tracker-extensions = %{version}-%{release} > > -# >> build post > -# << build post > -%install > -rm -rf %{buildroot} > -# >> install pre > -export INSTALL_ROOT=%{buildroot} > -# << install pre > -%make_install > +%description -n libqtcontacts-tracker-extensions-devel > +The qtcontacts-tracker-extensions-devel package includes the header files > +for qtcontacts-tracker-extensions. > > -# >> install post > -# << install post > -%fdupes %{buildroot}/%{_datadir}/libqtcontacts-tracker-tests/ > > +%prep > +%setup -q -n %{name}-%{version} > > +%patch0 -p1 > +%patch1 -p1 > > +%build > +./configure --prefix %{_prefix} --disable-builddirs-rpath > > +make # %{?jobs:-j%jobs} > > +%install > +rm -rf %{buildroot} > +make install INSTALL_ROOT=$RPM_BUILD_ROOT > > +%fdupes %{buildroot}/%{_datadir}/libqtcontacts-tracker-tests/ > > +%post -n libqtcontacts-tracker-extensions -p /sbin/ldconfig > > +%postun -n libqtcontacts-tracker-extensions -p /sbin/ldconfig > > %files > %defattr(-,root,root,-) > -# >> files > %{_libdir}/qt4/plugins/contacts/libqtcontacts_tracker.so > -# << files > > > %files tests > %defattr(-,root,root,-) > -# >> files tests > -%{_bindir}/bm_* > %{_bindir}/ut_* > %{_datadir}/libqtcontacts-tracker-tests/* > -# << files tests > + > +%files benchmarks > +%defattr(-,root,root,-) > +%{_bindir}/bm_* > + > +%files -n libqtcontacts-tracker-extensions > +%defattr(-,root,root,-) > +%{_libdir}/libqtcontacts_extensions_tracker.so.* > + > +%files -n libqtcontacts-tracker-extensions-devel > +%defattr(-,root,root,-) > +%{_libdir}/libqtcontacts_extensions_tracker.so > +%{_libdir}/libqtcontacts_extensions_tracker.prl > +%{_includedir}/qtcontacts-tracker/* > +%{_datadir}/qt4/mkspecs/features/* > > > other changes: > -------------- > > ++++++ 0001-Changes-Update-header-location-for-TrackerChangeList.patch > (new) > --- 0001-Changes-Update-header-location-for-TrackerChangeList.patch > +++ 0001-Changes-Update-header-location-for-TrackerChangeList.patch > +From 96f1dbebb752252c39ef7aef3e715bbd67c2d687 Mon Sep 17 00:00:00 > 2001 > +From: Adrien Bustany <[email protected]> > +Date: Mon, 29 Nov 2010 11:30:42 +0200 > +Subject: [PATCH] Changes: Update header location for TrackerChangeListener > + > +RevBy: TrustMe > +RevBy: people-review > +Details: > +Header location changed in libqtsparql-tracker-extensions 0.0.3 > +--- > + debian/control | 6 +++--- > + src/dao/dao.pri | 2 +- > + src/engine/trackerchangelistener.h | 2 +- > + 3 files changed, 5 insertions(+), 5 deletions(-) > + > +diff --git a/debian/control b/debian/control > +index f9e4b6a..706a4fe 100644 > +--- a/debian/control > ++++ b/debian/control > +@@ -5,7 +5,7 @@ Uploaders: Mathias Hasselmann > <[email protected]> > + Build-Depends: > + libqttracker-dev (>= 1~6.11), > + libqtsparql-dev (>= 0.0.11), > +- libqtsparql-tracker-dev (>= 0.0.2), > ++ libqtsparql-tracker-extensions-dev (>= 0.0.2), > + libqtm-contacts-dev (>= 1.1.0~git20101005), > + libqtm-versit-dev (>= 1.1.0~git0), > + libqtm-organizer-dev (>= 1.1.0~git0), > +@@ -23,7 +23,7 @@ Architecture: any > + Depends: > + ${shlibs:Depends}, ${misc:Depends}, tracker (>= 0.9.25), > + libqtcontacts-extensions-tracker0 (=${binary:Version}), > +- libqtsparql-tracker > ++ libqtsparql-tracker-extensions0 > + Recommends: contactsd, libqtsparql-tracker-direct > + Conflicts: contactsd (<< 0.5.34) > + Description: QtContact tracker storage plugin > +@@ -43,7 +43,7 @@ Package: libqtcontacts-tracker-tests > + Section: libdevel > + Architecture: any > + Depends: ${shlibs:Depends}, ${misc:Depends}, testrunner-lite, > libqtcontacts-tracker, ci-testing > +-XB-Maemo-CI-Packages: libqttracker1pre6, tracker, libqtsparql-tracker > ++XB-Maemo-CI-Packages: libqttracker1pre6, tracker, > libqtsparql-tracker-extensions > + XB-Maemo-CI-Stage: fast, staging, acceptance > + Description: QtContact tracker storage plugin (unit tests) > + This plugin permits QtContacts to use tracker as contact store. > +diff --git a/src/dao/dao.pri b/src/dao/dao.pri > +index 8b87253..9322d42 100644 > +--- a/src/dao/dao.pri > ++++ b/src/dao/dao.pri > +@@ -6,7 +6,7 @@ MOBILITY += contacts > + CONFIG += link_pkgconfig > + PKGCONFIG += qttracker > + > +-CONFIG += qtsparql qtsparql-tracker > ++CONFIG += qtsparql qtsparql-tracker-extensions > + > + DEPENDPATH *= $$PWD/.. > + INCLUDEPATH *= $$PWD/.. > +diff --git a/src/engine/trackerchangelistener.h > b/src/engine/trackerchangelistener.h > +index 5294701..c47db1f 100644 > +--- a/src/engine/trackerchangelistener.h > ++++ b/src/engine/trackerchangelistener.h > +@@ -45,7 +45,7 @@ > + #include <qtcontacts.h> > + > + #include <QtCore/QTimer> > +-#include <QtSparqlTracker/TrackerChangeNotifier> > ++#include <QtSparqlTrackerExtensions/TrackerChangeNotifier> > + > + QTM_USE_NAMESPACE; > + > +-- > +1.7.2.2 > + > > ++++++ qt-contacts-tracker-disable-schemalister.patch (new) > --- qt-contacts-tracker-disable-schemalister.patch > +++ qt-contacts-tracker-disable-schemalister.patch > +diff --git a/tools/tools.pro b/tools/tools.pro > +index 7cae3a2..571906e 100644 > +--- a/tools/tools.pro > ++++ b/tools/tools.pro > +@@ -1,7 +1,6 @@ > + TEMPLATE = subdirs > + > + SUBDIRS = \ > +- schemalister \ > + vcardreader.pro \ > + vcardwriter.pro \ > + vcf2xml.pro > > ++++++ qtcontacts-tracker-4.9.4.tar.bz2 -> > qtcontacts-tracker-4.10.91.3.tar.bz2 > 24111 lines of diff (skipped) > > ++++++ deleted files: > --- qtcontacts-tracker.yaml > > _______________________________________________ > 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
