- up to 3.0.0; merged from DEVEL

Changed files:
    empathy.spec -> 1.79

diff --git a/empathy.spec b/empathy.spec
index c1fb0b7459035e1381e4216ee93c3514d5f41e07..1d89911cbd11a3fdd6c9d193949fbd9df835a14f 100644 (file)
--- a/empathy.spec
+++ b/empathy.spec
@@ -1,52 +1,55 @@
 Summary:       Very easy to use GNOME Telepathy client
 Summary(pl.UTF-8):     Bardzo łatwy w użyciu klient Telepathy dla GNOME
 Name:          empathy
-Version:       2.32.1
-Release:       3
+Version:       3.0.0
+Release:       1
 License:       GPL v2
 Group:         Applications/Communications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/empathy/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: 09e7d72cd58a5f776b5097e7d5596095
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/empathy/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: be1a5e21f45e0d7446a1bd5becc29eed
 Patch0:                configure.patch
 URL:           http://live.gnome.org/Empathy
-BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: NetworkManager-devel >= 0.7.0
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
-BuildRequires: clutter-gtk-devel >= 0.10.0
+BuildRequires: clutter-gtk-devel >= 0.90.3
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
 BuildRequires: enchant-devel >= 1.2.0
-BuildRequires: evolution-data-server-devel >= 2.24.0
+BuildRequires: evolution-data-server-devel >= 2.91.90
 BuildRequires: farsight2-devel
-BuildRequires: folks-devel >= 0.1.5
+BuildRequires: folks-devel >= 0.4.0
 BuildRequires: geoclue-devel >= 0.11
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.26.0
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-control-center-devel >= 2.91.90
 BuildRequires: gnome-doc-utils >= 0.18.0
-BuildRequires: gnome-keyring-devel >= 2.26.0
+BuildRequires: gnome-keyring-devel >= 2.91.4
 BuildRequires: gnutls-devel >= 2.8.5
+BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: gtk+2-devel >= 2:2.22.0
-BuildRequires: gtk-webkit-devel >= 1.1.15
+BuildRequires: gtk+3-devel >= 3.0.2
+BuildRequires: gtk-webkit3-devel >= 1.3.2
 BuildRequires: intltool >= 0.40.0
 BuildRequires: iso-codes >= 0.35
-BuildRequires: libcanberra-gtk-devel >= 0.4
-BuildRequires: libchamplain-devel >= 0.8.0
+BuildRequires: libcanberra-gtk3-devel >= 0.25
+BuildRequires: libchamplain-devel >= 0.9.0
 BuildRequires: libgnome-keyring-devel >= 2.26.0
-BuildRequires: libnotify-devel >= 0.4.4
+BuildRequires: libnotify-devel >= 0.7.0
 BuildRequires: libtool
-BuildRequires: libunique-devel >= 1.1.2
 BuildRequires: libxml2-devel >= 1:2.6.28
-BuildRequires: nautilus-sendto-devel >= 2.32.0
+BuildRequires: libxslt-progs
+BuildRequires: nautilus-sendto-devel >= 2.91.6
 BuildRequires: pkgconfig
+BuildRequires: python >= 2.3
+BuildRequires: python-modules >= 2.3
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.592
 BuildRequires: telepathy-farsight-devel >= 0.0.14
-BuildRequires: telepathy-glib-devel >= 0.12.0
-BuildRequires: telepathy-logger-devel >= 0.1.5
+BuildRequires: telepathy-glib-devel >= 0.14.1
+BuildRequires: telepathy-logger-devel >= 0.2.0
 Requires(post,postun): glib2 >= 1:2.26.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
@@ -80,7 +83,7 @@ Summary:      Empathy support for sending files in Nautilus
 Summary(pl.UTF-8):     Obsługa Empathy przy wysyłaniu plików z Nautilusa
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      nautilus-sendto >= 2.32.0
+Requires:      nautilus-sendto >= 2.91.6
 
 %description -n nautilus-sendto-empathy
 This plugin enables sending files from Nautilus to your Empathy
@@ -103,24 +106,21 @@ kontaktów Empathy.
 %{__automake}
 %configure \
        --with-connectivity=nm \
-       --disable-schemas-install \
        --disable-silent-rules \
        --disable-static \
-       --enable-favourite-contacts \
        --enable-location \
        --enable-nautilus-sendto
 
-%{__make} -j 1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+       DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus-sendto/plugins/*.la
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus-sendto/plugins/*.la \
+       $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
 
 %find_lang %{name} --with-gnome --with-omf
 
@@ -143,15 +143,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/empathy-debugger
 %attr(755,root,root) %{_libexecdir}/empathy-auth-client
 %attr(755,root,root) %{_libexecdir}/empathy-av
+%attr(755,root,root) %{_libexecdir}/empathy-chat
+%{_libdir}/control-center-1/panels/libempathy-accounts-panel.so
 %{_datadir}/%{name}
 %{_datadir}/GConf/gsettings/empathy.convert
-%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Chat.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Empathy.gschema.xml
-%{_datadir}/telepathy/clients/Empathy.client
 %{_datadir}/telepathy/clients/Empathy.AudioVideo.client
 %{_datadir}/telepathy/clients/Empathy.Auth.client
+%{_datadir}/telepathy/clients/Empathy.Chat.client
 %{_iconsdir}/hicolor/*/apps/*
 %{_mandir}/man1/empathy*.1*
 %{_desktopdir}/*.desktop