packages: empathy/empathy.spec, empathy/empathy-clutter-gtk-0.10.patch (REM...
patrys
patrys at pld-linux.org
Mon Mar 29 19:28:22 CEST 2010
Author: patrys Date: Mon Mar 29 17:28:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/empathy:
empathy.spec (1.57 -> 1.58) , empathy-clutter-gtk-0.10.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/empathy/empathy.spec
diff -u packages/empathy/empathy.spec:1.57 packages/empathy/empathy.spec:1.58
--- packages/empathy/empathy.spec:1.57 Sat Feb 20 18:14:48 2010
+++ packages/empathy/empathy.spec Mon Mar 29 19:28:16 2010
@@ -2,12 +2,12 @@
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.28.2
-Release: 3
+Version: 2.30.0
+Release: 1
License: GPL v2
Group: Applications/Communications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/empathy/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 8d578d82d1e51dc8c83642b81c0fb65a
+Source0: http://ftp.gnome.org/pub/GNOME/sources/empathy/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: d7525475d5d3a0274212637852dc0d7d
URL: http://live.gnome.org/Empathy
BuildRequires: GConf2-devel >= 2.26.0
BuildRequires: NetworkManager-devel >= 0.7
@@ -38,6 +38,7 @@
BuildRequires: libtool
BuildRequires: libunique-devel
BuildRequires: libxml2-devel >= 1:2.6.28
+BuildRequires: nautilus-sendto-devel >= 2.28.0.1
BuildRequires: pkgconfig
BuildRequires: python-pygtk-devel
BuildRequires: rpm-pythonprov
@@ -50,14 +51,17 @@
Requires(post,postun): gtk+2 >= 2:2.12.0
Requires(post,postun): hicolor-icon-theme
Requires(post,preun): GConf2
-Requires: %{name}-libs = %{version}-%{release}
Suggests: telepathy-butterfly
Suggests: telepathy-gabble
Suggests: telepathy-haze
Suggests: telepathy-idle
Suggests: telepathy-salut
Suggests: telepathy-sofiasip
+Obsoletes: empathy-apidocs < 2.29.1
+Obsoletes: empathy-devel < 2.29.1
+Obsoletes: empathy-libs < 2.29.1
Obsoletes: gnome-jabber
+Obsoletes: python-empathy < 2.29.1
# sr at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,61 +74,23 @@
Celem Empathy jest uczynienie komunikowania poprzez Jabbera tak łatwym
jak to tylko możliwe.
-%package libs
-Summary: Libraries for Empathy
-Summary(pl.UTF-8): Biblioteki dla Empathy
-Group: Libraries
-
-%description libs
-Libraries for Empathy.
-
-%description libs -l pl.UTF-8
-Biblioteki dla Empathy.
-
-%package devel
-Summary: Empathy header files
-Summary(pl.UTF-8): Pliki nagłówkowe Empathy
-Group: X11/Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: gtk+2-devel >= 2:2.16.0
-Requires: libcanberra-gtk-devel >= 0.4
-Requires: libxml2-devel >= 1:2.6.28
-Requires: telepathy-glib-devel >= 0.7.36
-Requires: telepathy-mission-control-devel >= 5.0
-
-%description devel
-Empathy header files.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe Empathy.
-
-%package apidocs
-Summary: Empathy API documentation
-Summary(pl.UTF-8): Dokumentacja API Empathy
-Group: Documentation
-Requires: gtk-doc-common
-
-%description apidocs
-Empathy API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API Empathy.
-
-%package -n python-%{name}
-Summary: Python module for Empathy
-Summary(pl.UTF-8): Moduł Pythona dla Empathy
-Group: Libraries/Python
-Requires: %{name}-libs = %{version}-%{release}
+%package -n nautilus-sendto-empathy
+Summary: Empathy support for sending files in Nautilus
+Summary(pl.UTF-8): Wsparcie Empathy przy wysyłaniu plików z Nautilusa
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+Requires: nautilus-sendto >= 2.28.0.1
-%description -n python-%{name}
-Python module for Empathy.
+%description -n nautilus-sendto-empathy
+Enables sending files from Nautilus to your Empathy contacts.
-%description -n python-%{name} -l pl.UTF-8
-Moduł Pythona dla Empathy.
+%description -n nautilus-sendto-empathy -l pl.UTF-8
+Pozwala na przesyłanie z Nautilusa plików do kontaktów Empathy.
%prep
%setup -q
-%{__sed} 's/libnm_glib/libnm-glib/' -i configure.ac
+rm po/en at shaw.po
+sed -i 's/^en at shaw//' po/LINGUAS
%build
%{__intltoolize}
@@ -139,6 +105,7 @@
--disable-schemas-install \
--disable-static \
--enable-location \
+ --enable-nautilus-sendto \
--enable-gtk-doc \
--enable-shave \
--with-html-dir=%{_gtkdocdir}
@@ -160,63 +127,31 @@
%post
%gconf_schema_install empathy.schemas
-%gconf_schema_install GNOME_Megaphone_Applet.schemas
%update_icon_cache hicolor
%preun
%gconf_schema_uninstall empathy.schemas
-%gconf_schema_uninstall GNOME_Megaphone_Applet.schemas
%postun
%update_icon_cache hicolor
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS CONTRIBUTORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/empathy
-%attr(755,root,root) %{_bindir}/empathy-logs
+%attr(755,root,root) %{_bindir}/empathy-accounts
+%attr(755,root,root) %{_bindir}/empathy-debugger
%{_datadir}/%{name}
%{_datadir}/telepathy/clients/Empathy.client
%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%{_iconsdir}/hicolor/*/apps/*
%{_sysconfdir}/gconf/schemas/empathy.schemas
-%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
-%attr(755,root,root) %{_libdir}/nothere-applet
-%attr(755,root,root) %{_libdir}/megaphone-applet
-%{_libdir}/bonobo/servers/*.server
%{_mandir}/man1/empathy*.1*
%{_desktopdir}/*.desktop
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libempathy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libempathy.so.30
-%attr(755,root,root) %{_libdir}/libempathy-gtk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libempathy-gtk.so.28
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libempathy.so
-%attr(755,root,root) %{_libdir}/libempathy-gtk.so
-%{_libdir}/libempathy.la
-%{_libdir}/libempathy-gtk.la
-%{_includedir}/libempathy
-%{_includedir}/libempathy-gtk
-%{_pkgconfigdir}/libempathy.pc
-%{_pkgconfigdir}/libempathy-gtk.pc
-
-%files apidocs
+%files -n nautilus-sendto-empathy
%defattr(644,root,root,755)
-%{_gtkdocdir}/libempathy
-%{_gtkdocdir}/libempathy-gtk
-
-%files -n python-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/empathy.so
-%attr(755,root,root) %{py_sitedir}/empathygtk.so
+%attr(755,root,root) %{_libdir}/nautilus-sendto/plugins/libnstempathy.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -224,6 +159,21 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.58 2010/03/29 17:28:16 patrys
+- merged from DEVEL
+
+Revision 1.52.2.12 2010/03/29 17:24:59 patrys
+- 2.30.0
+
+Revision 1.52.2.11 2010/03/10 08:56:05 patrys
+- 2.29.92
+
+Revision 1.52.2.10 2010/03/09 12:27:59 patrys
+- 2.29.91.2
+
+Revision 1.52.2.9 2010/02/25 16:52:03 patrys
+- 2.29.91
+
Revision 1.57 2010/02/20 17:14:48 sparky
- rel 3; STBR
@@ -235,11 +185,36 @@
Revision 1.55 2010/02/20 16:24:29 megabajt
- release 2
+Revision 1.52.2.8 2010/02/09 09:29:30 patrys
+- 2.29.90
+
+Revision 1.52.2.7 2010/01/28 09:51:21 patrys
+- 2.29.6
+
+Revision 1.52.2.6 2010/01/12 20:25:19 patrys
+- 2.29.5.1
+
+Revision 1.52.2.5 2009/12/28 13:51:32 patrys
+- 2.29.4
+
Revision 1.54 2009/12/14 19:37:05 megabajt
- updated to 2.28.2
+Revision 1.52.2.4 2009/12/13 14:08:21 patrys
+- enable sendto
+
+Revision 1.52.2.3 2009/12/01 10:47:04 patrys
+- 2.29.3
+
Revision 1.53 2009/11/21 19:49:47 megabajt
- updated to 2.28.1.2
+
+Revision 1.52.2.2 2009/11/17 10:29:43 patrys
+- drop R: -libs
+- drop en at shaw
+
+Revision 1.52.2.1 2009/11/17 10:19:06 patrys
+- 2.29.2
Revision 1.52 2009/11/12 12:05:04 patrys
- rebuild
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/empathy/empathy.spec?r1=1.57&r2=1.58&f=u
More information about the pld-cvs-commit
mailing list