From 8bc5d6808cdab14b82caeb59791dcd7dc9771ae355f0d726339786483a0dbfc4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Mar 2013 22:43:41 +0000 Subject: [PATCH] Accepting request 158503 from GNOME:Next Push GNOME:Next OBS-URL: https://build.opensuse.org/request/show/158503 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/telepathy-glib?expand=0&rev=144 --- telepathy-glib.changes | 7 ++++++- telepathy-glib.spec | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/telepathy-glib.changes b/telepathy-glib.changes index 7f81086..22a7cd3 100644 --- a/telepathy-glib.changes +++ b/telepathy-glib.changes @@ -1,10 +1,15 @@ +------------------------------------------------------------------- +Fri Mar 1 12:46:56 UTC 2013 - dimstar@opensuse.org + +- Spec-cleanup using format_spec_file service. + ------------------------------------------------------------------- Sun Jan 13 16:18:16 UTC 2013 - zaitor@opensuse.org - Add tg-add-TpAccount-uri-schemes-property.patch, tg-implement-change-notification-on-uri-schemes-property.patch and tg-tests-simple-account-add-uri.patch, needed to ensure - visual feedback on sip accounts changes (fdo#40393). + visual feedback on sip accounts changes (fdo#40393). ------------------------------------------------------------------- Tue Nov 13 09:58:30 UTC 2012 - dimstar@opensuse.org diff --git a/telepathy-glib.spec b/telepathy-glib.spec index c3f945d..c31fabf 100644 --- a/telepathy-glib.spec +++ b/telepathy-glib.spec @@ -24,11 +24,11 @@ License: LGPL-2.1+ Group: Development/Languages/C and C++ Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-glib/%{name}-%{version}.tar.gz -# PATCHFIX-UPSTREAM tg-tests-simple-account-add-uri.patch fdo#40393 -- Changes made to sipaccounts does not appear. +# PATCH-FIX-UPSTREAM tg-tests-simple-account-add-uri.patch fdo#40393 zaitor@opensuse.org -- Changes made to sipaccounts does not appear. Patch0: tg-tests-simple-account-add-uri.patch -# PATCHFIX-UPSTREAM tg-add-TpAccount-uri-schemes-property.patch fdo#40393 -- Changes made to sipaccounts does not appear. +# PATCH-FIX-UPSTREAM tg-add-TpAccount-uri-schemes-property.patch fdo#40393 zaitor@opensuse.org -- Changes made to sipaccounts does not appear. Patch1: tg-add-TpAccount-uri-schemes-property.patch -# PATCHFIX-UPSTREAM tg-implement-change-notification-on-uri-schemes-property.patch fdo#40393 -- Changes made to sipaccounts does not appear. +# PATCH-FIX-UPSTREAM tg-implement-change-notification-on-uri-schemes-property.patch fdo#40393 zaitor@opensuse.org -- Changes made to sipaccounts does not appear. Patch2: tg-implement-change-notification-on-uri-schemes-property.patch BuildRequires: gtk-doc >= 1.17 BuildRequires: libxslt-devel @@ -91,6 +91,21 @@ Telepathy D-Bus API. %patch0 -p1 %patch1 -p1 %patch2 -p1 +if ! grep GLib.Object * -r -l; then + echo "Remove this hack.. it's fixed in the code base." +else + for file in $(grep GLib.Object * -r -l); do + sed -i "s:GLib.Object:GObject.Object:g" $file + done +fi +if ! grep GObject.Strv * -r -l; then + echo "Remove this hack.. it's fixed in the code base." +else + for file in $(grep GLib.Object * -r -l); do + sed -i "s:GObject.Strv:GStrv:g" + done +fi + %build %configure --disable-static \ --enable-vala-bindings