packages: pidgin/pidgin.spec, pidgin/pidgin-nolibs.patch - 2.7.0

[uzsolt]

Author: uzsolt                       Date: Fri May 14 13:47:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.7.0

---- Files affected:
packages/pidgin:
   pidgin.spec (1.262 -> 1.263) , pidgin-nolibs.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/pidgin/pidgin.spec
diff -u packages/pidgin/pidgin.spec:1.262 packages/pidgin/pidgin.spec:1.263
--- packages/pidgin/pidgin.spec:1.262	Wed Apr 28 08:52:17 2010
+++ packages/pidgin/pidgin.spec	Fri May 14 15:47:02 2010
@@ -41,15 +41,15 @@
 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.6.6
-Release:	5
+Version:	2.7.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
-# Source0-md5:	b37ab6c52db8355e8c70c044c2ba17c1
+# Source0-md5:	63a36f91d29f5ac5a402ffd2d7dbbb72
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-dbus-dir.patch
-Patch2:		%{name}-libgadu.patch
+# Patch2:		%{name}-libgadu.patch
 URL:		http://www.pidgin.im/
 BuildRequires:	GConf2
 BuildRequires:	GConf2-devel >= 2.16.0
@@ -491,7 +491,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+# %patch2 -p1
 
 %build
 %if %{with dotnet}
@@ -501,7 +501,7 @@
 fi
 %endif
 
-%{__intltoolize}
+# %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4macros
 %{__autoheader}
@@ -827,6 +827,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263  2010/05/14 13:47:02  uzsolt
+- 2.7.0
+
 Revision 1.262  2010/04/28 06:52:17  glen
 - updated (english) desc/summary from fc; rel 5
 

================================================================
Index: packages/pidgin/pidgin-nolibs.patch
diff -u packages/pidgin/pidgin-nolibs.patch:1.2 packages/pidgin/pidgin-nolibs.patch:1.3
--- packages/pidgin/pidgin-nolibs.patch:1.2	Fri Mar 23 16:38:10 2007
+++ packages/pidgin/pidgin-nolibs.patch	Fri May 14 15:47:03 2010
@@ -1,14 +1,13 @@
-diff -aurN gaim-2.0.0beta1.orig/configure.ac gaim-2.0.0beta1/configure.ac
---- gaim-2.0.0beta1.orig/configure.ac	2005-12-17 22:28:54.000000000 +0100
-+++ gaim-2.0.0beta1/configure.ac	2005-12-19 15:14:20.000000000 +0100
-@@ -65,8 +65,8 @@
+--- pidgin-2.7.0-orig/configure.ac	2010-05-14 10:50:13.801960582 +0200
++++ pidgin-2.7.0/configure.ac	2010-05-14 10:50:47.245498821 +0200
+@@ -143,8 +143,8 @@
  dnl Check for inet_aton
  AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
- 				         [AC_ERROR(inet_aton not found)])])
+ 				         [AC_MSG_ERROR([inet_aton not found])])])
 -AC_CHECK_LIB(resolv, __res_query)
 -AC_CHECK_LIB(nsl, gethostent)
 +AC_CHECK_FUNC(resolv, ,[AC_CHECK_LIB(resolv, __res_query)])
 +AC_CHECK_FUNC(gethostent, , [AC_CHECK_LIB(nsl, gethostent)])
  AC_CHECK_FUNC(socket, ,
-               [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
+ 	[AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
  dnl If all goes well, by this point the previous two checks will have
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pidgin/pidgin.spec?r1=1.262&r2=1.263&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pidgin/pidgin-nolibs.patch?r1=1.2&r2=1.3&f=u