From 4a8c76ab64c47b4717cab92ac87edfab95b29339 Mon Sep 17 00:00:00 2001 From: Patryk Zawadzki Date: Fri, 30 Sep 2011 09:10:44 +0000 Subject: [PATCH] - 3.2.0 - merged from DEVEL Changed files: empathy.spec -> 1.85 --- empathy.spec | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/empathy.spec b/empathy.spec index 37b7322..b3fa60c 100644 --- a/empathy.spec +++ b/empathy.spec @@ -1,31 +1,31 @@ Summary: High-level library and user-interface for Telepathy Summary(pl.UTF-8): Bardzo łatwy w użyciu klient Telepathy dla GNOME Name: empathy -Version: 3.0.2 -Release: 2 +Version: 3.2.0 +Release: 1 License: GPL v2+ Group: Applications/Communications -Source0: http://ftp.gnome.org/pub/GNOME/sources/empathy/3.0/%{name}-%{version}.tar.bz2 -# Source0-md5: 4c3c3bd7c7dab59dfa6a49f79077b8ab -Patch0: configure.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/empathy/3.2/%{name}-%{version}.tar.xz +# Source0-md5: 316ad43c85f6bbe915cf3b013d4d9e9a URL: http://live.gnome.org/Empathy BuildRequires: NetworkManager-devel >= 0.7.0 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9 +BuildRequires: clutter-devel >= 1.7.14 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.91.90 +BuildRequires: evolution-data-server-devel >= 3.1.90 BuildRequires: farsight2-devel -BuildRequires: folks-devel >= 0.4.0 +BuildRequires: folks-devel >= 0.6.2 BuildRequires: geoclue-devel >= 0.11 BuildRequires: gettext-devel 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.91.4 +BuildRequires: gnome-online-accounts-devel BuildRequires: gnutls-devel >= 2.8.5 BuildRequires: gsettings-desktop-schemas-devel BuildRequires: gstreamer-devel @@ -35,7 +35,7 @@ BuildRequires: gtk-webkit3-devel >= 1.3.2 BuildRequires: intltool >= 0.40.0 BuildRequires: iso-codes >= 0.35 BuildRequires: libcanberra-gtk3-devel >= 0.25 -BuildRequires: libchamplain-devel >= 0.9.0 +BuildRequires: libchamplain-devel >= 0.12.0 BuildRequires: libgnome-keyring-devel >= 2.26.0 BuildRequires: libnotify-devel >= 0.7.0 BuildRequires: libtool @@ -48,8 +48,9 @@ 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.14.1 -BuildRequires: telepathy-logger-devel >= 0.2.0 +BuildRequires: telepathy-farstream-devel +BuildRequires: telepathy-glib-devel >= 0.15.3 +BuildRequires: telepathy-logger-devel >= 0.2.10-2 Requires(post,postun): glib2 >= 1:2.26.0 Requires(post,postun): gtk-update-icon-cache Requires(post,postun): hicolor-icon-theme @@ -98,7 +99,6 @@ kontaktów Empathy. %prep %setup -q -%patch0 -p1 %build %{__intltoolize} @@ -107,12 +107,22 @@ kontaktów Empathy. %{__autoconf} %{__autoheader} %{__automake} +# missing geocode-glib in pld %configure \ --with-connectivity=nm \ + --with-cheese \ + --with-eds \ --disable-silent-rules \ --disable-static \ + --disable-control-center-embedding \ + --disable-geocode \ + --enable-call \ + --enable-call-logs \ + --enable-gudev \ --enable-location \ - --enable-nautilus-sendto + --enable-map \ + --enable-nautilus-sendto \ + --enable-spell %{__make} @@ -122,8 +132,9 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus-sendto/plugins/*.la \ - $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus-sendto/plugins/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/mission-control-plugins.0/*.la +#%{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la %find_lang %{name} --with-gnome --with-omf @@ -144,19 +155,25 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/empathy %attr(755,root,root) %{_bindir}/empathy-accounts %attr(755,root,root) %{_bindir}/empathy-debugger +#%attr(755,root,root) %{_libdir}/control-center-1/panels/libempathy-accounts-panel.so %attr(755,root,root) %{_libexecdir}/empathy-auth-client %attr(755,root,root) %{_libexecdir}/empathy-av +%attr(755,root,root) %{_libexecdir}/empathy-call %attr(755,root,root) %{_libexecdir}/empathy-chat -%{_libdir}/control-center-1/panels/libempathy-accounts-panel.so +%attr(755,root,root) %{_libdir}/mission-control-plugins.0/mcp-account-manager-goa.so %{_datadir}/%{name} %{_datadir}/GConf/gsettings/empathy.convert %{_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.Call.service %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Chat.service +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service %{_datadir}/glib-2.0/schemas/org.gnome.Empathy.gschema.xml +%{_datadir}/telepathy/clients/Empathy.AudioVideo.client %{_datadir}/telepathy/clients/Empathy.Auth.client +%{_datadir}/telepathy/clients/Empathy.Call.client %{_datadir}/telepathy/clients/Empathy.Chat.client -%{_datadir}/telepathy/clients/Empathy.AudioVideo.client +%{_datadir}/telepathy/clients/Empathy.FileTransfer.client %{_iconsdir}/hicolor/*/apps/* %{_mandir}/man1/empathy*.1* %{_desktopdir}/*.desktop -- 2.43.0