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/5919 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5919: Messages from BOSS: State: review at 2012-08-20T08:31:09 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:sage:branches:CE:MW:Shared / telepathy-ring -> CE:MW:Shared / telepathy-ring changes files: -------------- ++++++ new changes file: --- telepathy-ring.changes +++ telepathy-ring.changes @@ -0,0 +1,3 @@ +* Tue Jul 31 2012 Marko Saukko <[email protected]> - 2.1.3 +- Initial packaging for nemo. + new: ---- allow-target-id-in-channel-request.patch meego-cellular-telepathy-ring-2.1.3.tar.gz telepathy-ring.changes telepathy-ring.spec telepathy-ring.yaml spec files: ----------- ++++++ new spec file: --- telepathy-ring.spec +++ telepathy-ring.spec @@ -0,0 +1,100 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.25 +# + +Name: telepathy-ring + +# >> macros +# << macros +%define keepstatic 1 + +Summary: GSM connection manager for the Telepathy framework +Version: 2.1.3 +Release: 1 +Group: System/Libraries +License: LGPLv2.1 +URL: http://meego.gitorious.org/meego-cellular/telepathy-ring +Source0: meego-cellular-%{name}-%{version}.tar.gz +Source100: telepathy-ring.yaml +Patch0: allow-target-id-in-channel-request.patch +Requires: ofono +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(check) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(telepathy-glib) >= 0.11.7 +BuildRequires: python >= 2.5 + +%description +%{summary}. + +%package tests +Summary: Tests for %{name} +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description tests +%{summary}. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary}. + + +%prep +%setup -q -n meego-cellular-%{name} + +# allow-target-id-in-channel-request.patch +%patch0 -p1 +# >> setup +# << setup + +%build +# >> build pre +mkdir m4 +# << build pre + +%reconfigure +make %{?jobs:-j%jobs} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +# << install post + + +%files +%defattr(-,root,root,-) +# >> files +%{_datadir}/dbus-1/services/* +%{_datadir}/telepathy/managers/* +%{_libexecdir}/* +%doc %{_mandir}/man8/telepathy-ring.8.gz +# << files + +%files tests +%defattr(-,root,root,-) +# >> files tests +%{_libdir}/tests/* +# << files tests + +%files devel +%defattr(-,root,root,-) +# >> files devel +%{_libdir}/*.a +%{_includedir}/* +# << files devel other changes: -------------- ++++++ allow-target-id-in-channel-request.patch (new) --- allow-target-id-in-channel-request.patch +++ allow-target-id-in-channel-request.patch @@ -0,0 +1,39 @@ +From 23510429106929b4d66936f97da340b811e719ac Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Thu, 2 Aug 2012 20:10:34 -0400 +Subject: [PATCH 1/1] Allow TargetID to be present in channel requests + +MC sends both TargetID and TargetHandle. Ignore the TargetID, since +the two can be assumed to be equivalent. +--- + src/ring-media-manager.c | 1 + + src/ring-text-manager.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/ring-media-manager.c b/src/ring-media-manager.c +index e2aaf1b..1eccecd 100644 +--- a/src/ring-media-manager.c ++++ b/src/ring-media-manager.c +@@ -526,6 +526,7 @@ ring_call_channel_fixed_properties(void) + static char const * const ring_call_channel_allowed_properties[] = + { + TP_IFACE_CHANNEL ".TargetHandle", ++ TP_IFACE_CHANNEL ".TargetID", + TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", + TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", + NULL +diff --git a/src/ring-text-manager.c b/src/ring-text-manager.c +index ad70c7c..89b285c 100644 +--- a/src/ring-text-manager.c ++++ b/src/ring-text-manager.c +@@ -480,6 +480,7 @@ static char const * const ring_text_channel_fixed_properties_list[] = + static char const * const ring_text_channel_allowed_properties[] = + { + TP_IFACE_CHANNEL ".TargetHandle", ++ TP_IFACE_CHANNEL ".TargetID", + #if HAVE_TP_SMS_CHANNEL + TP_IFACE_CHANNEL_INTERFACE_SMS ".SMSChannel", + #endif +-- +1.7.9.5 + ++++++ meego-cellular-telepathy-ring-2.1.3.tar.gz (new) ++++++ telepathy-ring.yaml (new) --- telepathy-ring.yaml +++ telepathy-ring.yaml @@ -0,0 +1,38 @@ +Name: telepathy-ring +Summary: GSM connection manager for the Telepathy framework +Version: 2.1.3 +Release: 1 +Group: System/Libraries +License: LGPLv2.1 +URL: http://meego.gitorious.org/meego-cellular/telepathy-ring +Sources: + - "meego-cellular-%{name}-%{version}.tar.gz" +Patches: + - allow-target-id-in-channel-request.patch +Description: "%{summary}." + +Requires: + - ofono +PkgBR: + - python >= 2.5 +PkgConfigBR: + - glib-2.0 + - check + - libxslt + - dbus-1 + - dbus-glib-1 + - uuid + - telepathy-glib >= 0.11.7 +Configure: reconfigure +Builder: make +SubPackages: + - Name: tests + Summary: Tests for %{name} + Group: System/Libraries + Description: "%{summary}." + + - Name: devel + Summary: Development files for %{name} + Group: Development/Libraries + Description: "%{summary}." +
