packages: aMule/aMule.spec, aMule/aMule-ac.patch (NEW) - up to 2.2.6 - ac f...

[tommat]

Author: tommat                       Date: Sun Sep 20 12:24:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.6
- ac fixes

---- Files affected:
packages/aMule:
   aMule.spec (1.120 -> 1.121) , aMule-ac.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/aMule/aMule.spec
diff -u packages/aMule/aMule.spec:1.120 packages/aMule/aMule.spec:1.121
--- packages/aMule/aMule.spec:1.120	Mon Aug 10 18:13:23 2009
+++ packages/aMule/aMule.spec	Sun Sep 20 14:24:45 2009
@@ -2,14 +2,15 @@
 Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
-Version:	2.2.5
-Release:	3
+Version:	2.2.6
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://download.berlios.de/amule/%{name}-%{version}.tar.bz2
-# Source0-md5:	d26048f8e00a1ca801b3b41156b4268d
+# Source0-md5:	530d9b48187e36f78fc21bb19e94326d
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cas-datadir.patch
+Patch2:		%{name}-ac.patch
 URL:		http://www.amule.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
@@ -81,6 +82,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal} -I m4
@@ -182,6 +184,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2009/09/20 12:24:45  tommat
+- up to 2.2.6
+- ac fixes
+
 Revision 1.120  2009/08/10 16:13:23  hawk
 - reverted last commit by amateja, breaks building of package, aMule
   requires _automake 1.7 or higher_

================================================================
Index: packages/aMule/aMule-ac.patch
diff -u /dev/null packages/aMule/aMule-ac.patch:1.1
--- /dev/null	Sun Sep 20 14:24:51 2009
+++ packages/aMule/aMule-ac.patch	Sun Sep 20 14:24:46 2009
@@ -0,0 +1,24 @@
+diff -Nur aMule-2.2.5-orig/configure.in aMule-2.2.5/configure.in
+--- aMule-2.2.5-orig/configure.in	2009-05-16 09:38:01.000000000 +0200
++++ aMule-2.2.5/configure.in	2009-09-18 20:01:47.000000000 +0200
+@@ -538,7 +538,7 @@
+ AS_IF([test -n "$with_libupnp_prefix"], [libupnp_place=" (in $with_libupnp_prefix)"])
+ AS_IF([test x${ENABLE_UPNP} = xyes], [dnl
+ echo "                                       libupnp               ${LIBUPNP_VERSION:-Not detected}${libupnp_place:-}"
+-])dnl
++])
+ if test x${WEB:-no} != xno; then
+ AS_IF([test $regex_found = no], 
+ 	[regex_found="Not detected"],
+diff -Nur aMule-2.2.5-orig/m4/libupnp.m4 aMule-2.2.5/m4/libupnp.m4
+--- aMule-2.2.5-orig/m4/libupnp.m4	2009-03-28 20:29:59.000000000 +0100
++++ aMule-2.2.5/m4/libupnp.m4	2009-09-18 20:01:01.000000000 +0200
+@@ -76,7 +76,7 @@
+ 		], [dnl
+ 			result=no
+ 			resultstr=" (pkg-config not found)"
+-		])dnl
++		])
+ 		AC_MSG_RESULT([$result$resultstr])
+ 		libupnp_error="libupnp >= MIN_LIBUPNP_VERSION not found$resultstr"
+ 	], [dnl
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aMule/aMule.spec?r1=1.120&r2=1.121&f=u