I have made the following changes intended for : CE:MW:Shared / telepathy-ring
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/6046 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6046: Messages from BOSS: State: review at 2012-08-23T12:43:59 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: Project:MTF:MW / telepathy-ring -> CE:MW:Shared / telepathy-ring changes files: -------------- --- telepathy-ring.changes +++ telepathy-ring.changes @@ -0,0 +1,3 @@ +* Thu Aug 23 2012 Tom Swindell <[email protected]> - 2.1.3-2 +- Added auto-generation of telepathy ring account if not present on device boot. + new: ---- ensure-tpring-account.desktop ensure-tpring-account.sh spec files: ----------- --- telepathy-ring.spec +++ telepathy-ring.spec @@ -11,14 +11,17 @@ Summary: GSM connection manager for the Telepathy framework Version: 2.1.3 -Release: 1 +Release: 2 Group: System/Libraries License: LGPLv2.1 URL: http://meego.gitorious.org/meego-cellular/telepathy-ring Source0: meego-cellular-%{name}-%{version}.tar.gz +Source1: ensure-tpring-account.desktop +Source2: ensure-tpring-account.sh Source100: telepathy-ring.yaml Patch0: allow-target-id-in-channel-request.patch Requires: ofono +Requires: telepathy-mission-control BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(libxslt) @@ -70,6 +73,10 @@ %install rm -rf %{buildroot} # >> install pre +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ +mkdir -p $RPM_BUILD_ROOT%{_bindir}/ +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ # << install pre %make_install @@ -84,6 +91,8 @@ %{_datadir}/telepathy/managers/* %{_libexecdir}/* %doc %{_mandir}/man8/telepathy-ring.8.gz +%config %{_sysconfdir}/xdg/autostart/ensure-tpring-account.desktop +%{_bindir}/ensure-tpring-account.sh # << files %files tests other changes: -------------- ++++++ ensure-tpring-account.desktop (new) --- ensure-tpring-account.desktop +++ ensure-tpring-account.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Exec=/usr/bin/ensure-tpring-account.sh ++++++ ensure-tpring-account.sh (new) --- ensure-tpring-account.sh +++ ensure-tpring-account.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +account=$(/usr/bin/mc-tool list | grep -e '^ring/tel.*') + +if [ -z "$account" ]; then + echo "Creating telepathy ring account" + account=$(/usr/bin/mc-tool add ring/tel ring) +fi + +enabled=$(/usr/bin/mc-tool show "$account" | grep -oe 'Enabled:.*' | awk '{print $2}') + +if [ "$enabled" = "disabled" ]; then + echo "Enabling telepathy ring account" + /usr/bin/mc-tool enable "$account" + /usr/bin/mc-tool auto-connect "$account" +fi + +exit 0 ++++++ telepathy-ring.yaml --- telepathy-ring.yaml +++ telepathy-ring.yaml @@ -1,18 +1,21 @@ Name: telepathy-ring Summary: GSM connection manager for the Telepathy framework Version: 2.1.3 -Release: 1 +Release: 2 Group: System/Libraries License: LGPLv2.1 URL: http://meego.gitorious.org/meego-cellular/telepathy-ring Sources: - "meego-cellular-%{name}-%{version}.tar.gz" + - "ensure-tpring-account.desktop" + - "ensure-tpring-account.sh" Patches: - allow-target-id-in-channel-request.patch Description: "%{summary}." Requires: - ofono + - telepathy-mission-control PkgBR: - python >= 2.5 PkgConfigBR:
