Author: glen Date: Mon Apr 26 19:03:50 2010 GMT Module: packages Tag: HEAD ---- Log message: - disable eds as not compatible with gnome 2.30
---- Files affected: packages/pidgin: pidgin.spec (1.253 -> 1.254) ---- Diffs: ================================================================ Index: packages/pidgin/pidgin.spec diff -u packages/pidgin/pidgin.spec:1.253 packages/pidgin/pidgin.spec:1.254 --- packages/pidgin/pidgin.spec:1.253 Fri Feb 19 19:30:58 2010 +++ packages/pidgin/pidgin.spec Mon Apr 26 21:03:41 2010 @@ -11,12 +11,13 @@ # - subpackage libpurple and it's plugins # http://developer.pidgin.im/wiki/WhatIsLibpurple # - update pl description +# - restore e-d-s if http://developer.pidgin.im/ticket/10852 fixed # %bcond_without cap # without Contact Availability Prediction %bcond_without dbus # without D-BUS (for pidgin-remote and others) %bcond_without doc # do not generate and include documentation %bcond_with dotnet # build with mono support -%bcond_without evolution # compile without the Pidgin-Evolution plugin +%bcond_with evolution # compile without the Pidgin-Evolution plugin %bcond_with gnutls # use GnuTLS instead of NSS %bcond_without gtkspell # without gtkspell support %bcond_without meanwhile # without meanwhile support @@ -33,7 +34,7 @@ %ifarch i386 %undefine with_dotnet %endif -# + %include /usr/lib/rpm/macros.perl Summary: A client compatible with AOL's 'Instant Messenger' Summary(de.UTF-8): Pidgin ist ein Instant Messenger @@ -46,7 +47,7 @@ Release: 1 License: GPL v2+ Group: Applications/Communications -Source0: http://dl.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 # Source0-md5: b37ab6c52db8355e8c70c044c2ba17c1 Patch0: %{name}-nolibs.patch Patch1: %{name}-dbus-dir.patch @@ -694,9 +695,11 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/purple-2/libqq.so +%if %{with meanwhile} %files -n libpurple-protocol-sametime %defattr(644,root,root,755) -%{?with_meanwhile:%attr(755,root,root) %{_libdir}/purple-2/libsametime.so} +%attr(755,root,root) %{_libdir}/purple-2/libsametime.so +%endif %files -n libpurple-protocol-xmpp %defattr(644,root,root,755) @@ -726,6 +729,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.254 2010/04/26 19:03:41 glen +- disable eds as not compatible with gnome 2.30 + Revision 1.253 2010/02/19 18:30:58 rotom - 2.6.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pidgin/pidgin.spec?r1=1.253&r2=1.254&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
