I have made the following changes intended for : CE:MW:MTF / contactsd 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/5444 Thank You, aard [This message was auto-generated] --- Request # 5444: Messages from BOSS: State: review at 2012-08-09T14:02:12 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:aard:staging / contactsd -> CE:MW:MTF / contactsd changes files: -------------- ++++++ new changes file: --- contactsd.changes +++ contactsd.changes @@ -0,0 +1,2 @@ +* Thu Aug 09 2012 Bernd Wachter <[email protected]> - 1.1.1 +- Initial package for Nemo new: ---- 0001-Move-tests-according-to-Mer-packaging-guidelines.patch contactsd-1.1.1.tar.gz contactsd.changes contactsd.desktop contactsd.spec spec files: ----------- ++++++ new spec file: --- contactsd.spec +++ contactsd.spec @@ -0,0 +1,82 @@ +Name: contactsd +# using pr1.3 branch +Version: 1.1.1 +Release: 1 +Summary: Telepathy <> tracker bridge for contacts +Group: System/Libraries +URL: https://gitorious.org/qtcontacts-tracker/contactsd +License: LGPLv2 +Source0: %{name}-%{version}.tar.gz +Source1: contactsd.desktop +Patch0: 0001-Move-tests-according-to-Mer-packaging-guidelines.patch +BuildRequires: pkgconfig(qmsystem2) +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtSparql) +BuildRequires: pkgconfig(QtSparqlTrackerExtensions) +BuildRequires: pkgconfig(tracker-sparql-0.10) +BuildRequires: pkgconfig(TelepathyQt4) +BuildRequires: pkgconfig(QtContacts) +BuildRequires: pkgconfig(cubi-0.1) +#TODO: try to get it working with pkgconfig(mlite) +BuildRequires: pkgconfig(meegotouch) +BuildRequires: pkgconfig(libmkcal) +BuildRequires: pkgconfig(telepathy-glib) +BuildRequires: libcubi-tracker-ontologies-devel +BuildRequires: libqtcontacts-tracker-extensions-devel + +%description +contactsd is a service for collecting and observing changes in roster list +from all the users telepathy accounts (buddies, their status and presence +information), and store it to tracker. + +%files +%defattr(-,root,root,-) +%config %{_sysconfdir}/xdg/autostart/contactsd.desktop +%{_bindir}/contactsd +%{_libdir}/contactsd-1.0/plugins/*.so +# we currently don't have a backup framework +%exclude /usr/share/backup-framework/applications/contactsd.conf + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary}. + +%files devel +%defattr(-,root,root,-) +%{_includedir}/contactsd-1.0/* +%dir %{_includedir}/contactsd-1.0 +%{_libdir}/pkgconfig/*.pc + + +%package tests +Summary: Tests for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description tests +%{summary}. + +%files tests +%defattr(-,root,root,-) +/opt/tests/%{name} + + +%prep +%setup -q +%patch0 -p1 + + +%build +./configure --bindir %{_bindir} --libdir %{_libdir} --includedir %{_includedir} +make %{?_smp_mflags} + + +%install +make INSTALL_ROOT=%{buildroot} install +mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart +cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/xdg/autostart/ other changes: -------------- ++++++ 0001-Move-tests-according-to-Mer-packaging-guidelines.patch (new) --- 0001-Move-tests-according-to-Mer-packaging-guidelines.patch +++ 0001-Move-tests-according-to-Mer-packaging-guidelines.patch @@ -0,0 +1,141 @@ +From f6594e53014700408b977ae02ad7596f9be8ae75 Mon Sep 17 00:00:00 2001 +From: Bernd Wachter <[email protected]> +Date: Thu, 9 Aug 2012 16:10:09 +0300 +Subject: [PATCH] Move tests according to Mer packaging guidelines + +--- + tests/mktests.sh.in | 2 +- + tests/tests.pro | 4 ++-- + tests/ut_birthdayplugin/tests.pri | 10 +++++----- + tests/ut_birthdayplugin/ut_birthdayplugin.pro | 2 +- + tests/ut_telepathyplugin/tests.pri | 8 ++++---- + tests/ut_telepathyplugin/ut_telepathyplugin.pro | 2 +- + 6 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/tests/mktests.sh.in b/tests/mktests.sh.in +index 5e1457f..5129c67 100755 +--- a/tests/mktests.sh.in ++++ b/tests/mktests.sh.in +@@ -38,7 +38,7 @@ do + test -f "$suite/$suite.skip" && continue + + if [ -f $suite/$suite-wrapper.sh ]; then +- command="@PREFIX@/share/contactsd-tests/$suite/$suite-wrapper.sh" ++ command="/opt/tests/contactsd/$suite/$suite-wrapper.sh" + else + command="@BINDIR@/$suite/$suite" + fi +diff --git a/tests/tests.pro b/tests/tests.pro +index f7456c2..12bb0ae 100644 +--- a/tests/tests.pro ++++ b/tests/tests.pro +@@ -32,12 +32,12 @@ testxml.commands = sh $$PWD/mktests.sh $$UNIT_TESTS >$@ || rm -f $@ + testxml.depends = $$UNIT_TESTS + + install_testxml.files = $$testxml.target +-install_testxml.path = $$PREFIX/share/contactsd-tests ++install_testxml.path = /opt/tests/contactsd/test-definition/ + install_testxml.depends = $$testxml.target + install_testxml.CONFIG = no_check_exist + + install_extrascripts.files = with-session-bus.sh session.conf +-install_extrascripts.path = $$PREFIX/share/contactsd-tests ++install_extrascripts.path = /opt/tests/contactsd/ + install_extrascripts.depends = $$UNIT_TESTS + install_extrascripts.CONFIG = no_check_exist + +diff --git a/tests/ut_birthdayplugin/tests.pri b/tests/ut_birthdayplugin/tests.pri +index 2b2fbe2..7a3c408 100644 +--- a/tests/ut_birthdayplugin/tests.pri ++++ b/tests/ut_birthdayplugin/tests.pri +@@ -22,7 +22,7 @@ + + daemon.target = with-daemon.sh + daemon.depends = $$PWD/with-daemon.sh.in +-daemon.path = $$PREFIX/share/contactsd-tests ++daemon.path = /opt/tests/contactsd + daemon.commands = \ + sed -e \"s,@BINDIR@,$$BINDIR,g\" \ + -e \"s,@PLUGINDIR@,$$LIBDIR/contactsd-1.0/plugins,g\" \ +@@ -30,16 +30,16 @@ daemon.commands = \ + + wrapper.target = ut_birthdayplugin-wrapper.sh + wrapper.depends = $$PWD/ut_birthdayplugin-wrapper.sh.in +-wrapper.path = $$PREFIX/share/contactsd-tests/ut_birthdayplugin ++wrapper.path = /opt/tests/contactsd/ut_birthdayplugin + wrapper.commands = \ +- sed -e \"s,@SCRIPTDIR@,$$PREFIX/share/contactsd-tests,g\" \ +- -e \"s,@OUT_SCRIPTDIR@,$$PREFIX/share/contactsd-tests,g\" \ ++ sed -e \"s,@SCRIPTDIR@,/opt/tests/contactsd,g\" \ ++ -e \"s,@OUT_SCRIPTDIR@,/opt/tests/contactsd,g\" \ + -e \"s,@BINDIR@,$$BINDIR,g\" \ + -e \"s,@WITH_DAEMON@,$$daemon.target,g\" \ + $< > $@ && chmod +x $@ || rm -f $@ + + install_extrascripts.files = $$wrapper.target $$daemon.target +-install_extrascripts.path = $$PREFIX/share/contactsd-tests/ut_birthdayplugin ++install_extrascripts.path = /opt/tests/contactsd/ut_birthdayplugin + install_extrascripts.depends = daemon wrapper + install_extrascripts.CONFIG = no_check_exist + +diff --git a/tests/ut_birthdayplugin/ut_birthdayplugin.pro b/tests/ut_birthdayplugin/ut_birthdayplugin.pro +index ca9ee82..ec6179b 100644 +--- a/tests/ut_birthdayplugin/ut_birthdayplugin.pro ++++ b/tests/ut_birthdayplugin/ut_birthdayplugin.pro +@@ -21,7 +21,7 @@ + # conditions contained in a signed written agreement between you and Nokia. + + TARGET = ut_birthdayplugin +-target.path = $$BINDIR ++target.path = /opt/tests/contactsd + + include(check.pri) + include(tests.pri) +diff --git a/tests/ut_telepathyplugin/tests.pri b/tests/ut_telepathyplugin/tests.pri +index 621f212..66690bf 100644 +--- a/tests/ut_telepathyplugin/tests.pri ++++ b/tests/ut_telepathyplugin/tests.pri +@@ -22,7 +22,7 @@ + + daemon.target = with-daemon.sh + daemon.depends = $$PWD/with-daemon.sh.in +-daemon.path = $$PREFIX/share/contactsd-tests ++daemon.path = /opt/tests/contactsd + daemon.commands = \ + sed -e \"s,@BINDIR@,$$BINDIR,g\" \ + -e \"s,@PLUGINDIR@,$$LIBDIR/contactsd-1.0/plugins,g\" \ +@@ -30,15 +30,15 @@ daemon.commands = \ + + wrapper.target = ut_telepathyplugin-wrapper.sh + wrapper.depends = $$PWD/ut_telepathyplugin-wrapper.sh.in +-wrapper.path = $$PREFIX/share/contactsd-tests/ut_telepathyplugin ++wrapper.path = /opt/tests/contactsd/ut_telepathyplugin + wrapper.commands = \ +- sed -e \"s,@SCRIPTDIR@,$$PREFIX/share/contactsd-tests,g\" \ ++ sed -e \"s,@SCRIPTDIR@,/opt/tests/contactsd,g\" \ + -e \"s,@BINDIR@,$$BINDIR,g\" \ + -e \"s,@WITH_DAEMON@,$$daemon.target,g\" \ + $< > $@ && chmod +x $@ || rm -f $@ + + install_extrascripts.files = $$wrapper.target $$daemon.target +-install_extrascripts.path = $$PREFIX/share/contactsd-tests/ut_telepathyplugin ++install_extrascripts.path = /opt/tests/contactsd/ut_telepathyplugin + install_extrascripts.depends = daemon wrapper + install_extrascripts.CONFIG = no_check_exist + +diff --git a/tests/ut_telepathyplugin/ut_telepathyplugin.pro b/tests/ut_telepathyplugin/ut_telepathyplugin.pro +index 40ab6e9..5913f32 100644 +--- a/tests/ut_telepathyplugin/ut_telepathyplugin.pro ++++ b/tests/ut_telepathyplugin/ut_telepathyplugin.pro +@@ -23,7 +23,7 @@ + PRE_TARGETDEPS += ../libtelepathy/libtelepathy.a + + TARGET = ut_telepathyplugin +-target.path = $$BINDIR ++target.path = /opt/tests/contactsd + + include(check.pri) + include(tests.pri) +-- +1.7.10.4 + ++++++ contactsd-1.1.1.tar.gz (new) ++++++ contactsd.desktop (new) --- contactsd.desktop +++ contactsd.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Contacts daemon +Exec=/usr/bin/contactsd +Comment=Telepathy contacts observer +X-Moblin-Priority=Low +X-Meego-Watchdog=Restart
