- 2.7.0

Changed files:
    pidgin-nolibs.patch -> 1.3
    pidgin.spec -> 1.263

diff --git a/pidgin-nolibs.patch b/pidgin-nolibs.patch
index 5a30cc6ff98c25c67c4abc1fc990b85c25d5ede6..a88e1f7219fd18b279533e9ac38e20c6e891dac3 100644 (file)
--- a/pidgin-nolibs.patch
+++ b/pidgin-nolibs.patch
@@ -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

diff --git a/pidgin.spec b/pidgin.spec
index e15b50713fc160e8b9a81212b95f2b7a0c5333f9..fd22a417d8e388faf31cf722ff40c4c78818102c 100644 (file)
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -40,15 +40,15 @@ Summary(ko.UTF-8):  AOL 인스턴트 메신저와 호환되는 클라이언트
 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
@@ -490,7 +490,7 @@ Dokumentacja Pidgina dla programistów (format HTML).
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+# %patch2 -p1
 
 %build
 %if %{with dotnet}
@@ -500,7 +500,7 @@ if [ ! -f /proc/cpuinfo ]; then
 fi
 %endif
 
-%{__intltoolize}
+# %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4macros
 %{__autoheader}