SPECS (AC-branch): pidgin.spec - merge 2.4.0 from HEAD

[glen]

Author: glen                         Date: Sun Mar  2 23:52:24 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge 2.4.0 from HEAD

---- Files affected:
SPECS:
   pidgin.spec (1.196.4.9 -> 1.196.4.10) 

---- Diffs:

================================================================
Index: SPECS/pidgin.spec
diff -u SPECS/pidgin.spec:1.196.4.9 SPECS/pidgin.spec:1.196.4.10
--- SPECS/pidgin.spec:1.196.4.9	Mon Dec 10 10:44:38 2007
+++ SPECS/pidgin.spec	Mon Mar  3 00:52:18 2008
@@ -34,12 +34,12 @@
 Summary(pl.UTF-8):	Klient kompatybilny z AOL Instant Messenger
 Summary(pt_BR.UTF-8):	Um cliente para o AOL Instant Messenger (AIM)
 Name:		pidgin
-Version:	2.3.1
+Version:	2.4.0
 Release:	1
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
-# Source0-md5:	0a593c2c343d5b854bd2cd2be7542f40
+# Source0-md5:	d03ac2695d5b5304f86812ffd6ba0053
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-dbus-dir.patch
 Patch2:		%{name}-libgadu.patch
@@ -333,6 +333,7 @@
 %attr(755,root,root) %{_libdir}/finch/gntgf.so
 %attr(755,root,root) %{_libdir}/finch/gnthistory.so
 %attr(755,root,root) %{_libdir}/finch/gntlastlog.so
+%attr(755,root,root) %{_libdir}/finch/grouping.so
 %dir %{_libdir}/gnt
 %attr(755,root,root) %{_libdir}/gnt/*.so
 %endif
@@ -385,34 +386,40 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpurple.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpurple.so.0
 %if %{with dbus}
 %attr(755,root,root) %{_libdir}/libpurple-client.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpurple-client.so.0
 %endif
 %if %{with text}
 %attr(755,root,root) %{_libdir}/libgnt.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnt.so.0
 %endif
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpurple.so
 %{_libdir}/libpurple.la
-%if %{with dbus}
-%attr(755,root,root) %{_libdir}/libpurple-client.so
-%{_libdir}/libpurple-client.la
-%endif
 %dir %{_includedir}/libpurple
 %{_includedir}/libpurple/*.h
-%{_aclocaldir}/*.m4
 %dir %{_includedir}/pidgin
 %{_includedir}/pidgin/*.h
-%{_pkgconfigdir}/*
+%{_pkgconfigdir}/pidgin.pc
+%{_pkgconfigdir}/purple.pc
+%{_aclocaldir}/purple.m4
+%if %{with dbus}
+%attr(755,root,root) %{_libdir}/libpurple-client.so
+%{_libdir}/libpurple-client.la
+%endif
 %if %{with text}
 %attr(755,root,root) %{_libdir}/libgnt.so
 %{_libdir}/libgnt.la
-%dir %{_includedir}/gnt
 %dir %{_includedir}/finch
-%{_includedir}/gnt/*.h
 %{_includedir}/finch/*.h
+%dir %{_includedir}/gnt
+%{_includedir}/gnt/*.h
+%{_pkgconfigdir}/finch.pc
+%{_pkgconfigdir}/gnt.pc
 %endif
 
 %files perl
@@ -456,6 +463,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196.4.10  2008-03-02 23:52:18  glen
+- merge 2.4.0 from HEAD
+
 Revision 1.196.4.9  2007-12-10 09:44:38  glen
 - update to 2.3.1 from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pidgin.spec?r1=1.196.4.9&r2=1.196.4.10&f=u