diff --git a/empathy.spec b/empathy.spec index 6fdfa13..d37938e 100644 --- a/empathy.spec +++ b/empathy.spec @@ -7,6 +7,7 @@ %global network_manager_version 0.7.0 %global libcanberra_version 0.4 %global webkit_version 1.3.13 +%global goa_version 3.5.1 %global libnotify_version 0.7.0 %global libchamplain_version 0.12.1 %global folks_version 0.9.5 @@ -16,7 +17,7 @@ Name: empathy Version: 3.12.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Instant Messaging Client for GNOME License: GPLv2+ @@ -54,6 +55,7 @@ BuildRequires: cheese-libs-devel BuildRequires: pulseaudio-libs-devel BuildRequires: libgudev1-devel BuildRequires: telepathy-mission-control-devel +BuildRequires: gnome-online-accounts-devel >= %{goa_version} BuildRequires: libsecret-devel >= %{libsecret_version} BuildRequires: gcr-devel >= %{gcr_version} BuildRequires: pkgconfig(gee-0.8) @@ -88,7 +90,7 @@ rm data/empathy.desktop %build ## GCC complains about some unused functions, so we forcibly show those as ## simple warnings instead of build-halting errors. -%configure --disable-static --enable-ubuntu-online-accounts=no --enable-goa=no +%configure --disable-static --enable-ubuntu-online-accounts=no # Parallel builds are broken. make install -m 0644 %{SOURCE1} ./README.ConnectionManagers @@ -142,6 +144,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/%{name}/libempathy-gtk-%{version}.so %{_libdir}/%{name}/libempathy-gtk.so %{_libdir}/%{name}/libempathy.so +%{_libdir}/mission-control-plugins.0/mcp-account-manager-goa.so %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/empathy/ %{_datadir}/applications/%{name}.desktop @@ -195,6 +198,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css %changelog +* Fri Mar 06 2015 Kalev Lember - 3.12.7-3 +- Re-enable goa support + * Thu Mar 05 2015 Kalev Lember - 3.12.7-2 - Disable goa support until empathy gets ported to WebKit2