packages: aMule/aMule-ac.patch, aMule/aMule.spec - updated for 2.3.1

tommat tommat at pld-linux.org
Sun Feb 5 18:20:09 CET 2012 

Author: tommat                       Date: Sun Feb  5 17:20:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 2.3.1

---- Files affected:
packages/aMule:
   aMule-ac.patch (1.1 -> 1.2) , aMule.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: packages/aMule/aMule-ac.patch
diff -u packages/aMule/aMule-ac.patch:1.1 packages/aMule/aMule-ac.patch:1.2
--- packages/aMule/aMule-ac.patch:1.1	Sun Sep 20 14:24:46 2009
+++ packages/aMule/aMule-ac.patch	Sun Feb  5 18:20:04 2012
@@ -1,24 +1,16 @@
-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
+diff -Nur aMule-2.3.1-orig/m4/libpng.m4 aMule-2.3.1/m4/libpng.m4
+--- aMule-2.3.1-orig/m4/libpng.m4	2011-10-08 21:05:07.000000000 +0200
++++ aMule-2.3.1/m4/libpng.m4	2012-02-05 14:08:00.000000000 +0100
+@@ -95,9 +95,9 @@
+ 			SAVED_LDFLAGS=$LDFLAGS
+ 			SAVED_LIBS=$LIBS
+ 
+-			CFLAGS+=" $LIBPNG_CFLAGS"
+-			LDFLAGS+=" $LIBPNG_LDFLAGS"
+-			LIBS+=" $LIBPNG_LIBS"
++			CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
++			LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
++			LIBS="$LIBS $LIBPNG_LIBS"
+ 
+ 			AC_LINK_IFELSE([
+ 				AC_LANG_PROGRAM([[

================================================================
Index: packages/aMule/aMule.spec
diff -u packages/aMule/aMule.spec:1.147 packages/aMule/aMule.spec:1.148
--- packages/aMule/aMule.spec:1.147	Wed Feb  1 22:47:56 2012
+++ packages/aMule/aMule.spec	Sun Feb  5 18:20:04 2012
@@ -2,16 +2,15 @@
 Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
-Version:	2.2.6
-Release:	25
+Version:	2.3.1
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://download.berlios.de/amule/%{name}-%{version}.tar.bz2
-# Source0-md5:	530d9b48187e36f78fc21bb19e94326d
+Source0:	http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
+# Source0-md5:	31724290a440943f5b05d4dca413fe02
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cas-datadir.patch
 Patch2:		%{name}-ac.patch
-Patch3:		%{name}-build.patch
 URL:		http://www.amule.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
@@ -25,7 +24,7 @@
 BuildRequires:	gettext-autopoint
 BuildRequires:	gettext-devel >= 0.11.5
 BuildRequires:	gtk+2-devel >= 2:2.2.0
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
 BuildRequires:	wxGTK2-unicode-devel
@@ -85,7 +84,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__aclocal} -I m4
@@ -94,6 +92,7 @@
 %{__automake}
 %configure \
 	--with-wx-config=wx-gtk2-unicode-config		\
+	--with-libpng-config=/usr/bin/libpng-config	\
 	--%{?debug:en}%{!?debug:dis}able-debug		\
 	--%{?debug:dis}%{!?debug:en}able-optimize	\
 	--enable-amule-daemon				\
@@ -104,21 +103,10 @@
 	--enable-wxcas					\
 	--enable-alc					\
 	--enable-alcc					\
-	--enable-geoip
+	--enable-geoip					\
+	--enable-xas					\
+	--enable-optimize
 
-######################################################################################
-# UGLY UGLY BAD BAD BAD !!!!!
-# This should be fixable in another way
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/skins/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/webserver/litoral/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/webserver/chicane/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/webserver/default/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/webserver/php-default/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/utils/cas/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/utils/aLinkCreator/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/utils/xas/Makefile
-sed -i -e 's#echo "$$d$$p">/dev/null;#echo "$$d$$p";#' src/utils/wxCas/Makefile
-######################################################################################
 %{__make}
 
 %install
@@ -127,10 +115,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install src/utils/xas/xas.pl $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-install {amule.desktop,amulegui.desktop,src/utils/aLinkCreator/alc.desktop,src/utils/wxCas/wxcas.desktop} $RPM_BUILD_ROOT%{_desktopdir}
-install {amule.xpm,amulegui.xpm,src/utils/aLinkCreator/alc.xpm,src/utils/wxCas/wxcas.xpm} $RPM_BUILD_ROOT%{_pixmapsdir}
-
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/et{_EE,}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/ko{_KR,}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
@@ -143,7 +127,7 @@
 
 %files -f amule.lang
 %defattr(644,root,root,755)
-%doc docs/AUTHORS docs/EC_Protocol.txt docs/README docs/Changelog docs/ED2K-Links.HOWTO docs/TODO docs/amulesig.txt
+%doc docs/ABOUT-NLS docs/AUTHORS docs/Changelog docs/EC_Protocol.txt docs/README docs/TODO docs/amulesig.txt
 %attr(755,root,root) %{_bindir}/autostart-xas
 %attr(755,root,root) %{_bindir}/amule*
 %attr(755,root,root) %{_bindir}/ed2k
@@ -156,24 +140,32 @@
 %{_pixmapsdir}/amulegui.xpm
 %{_mandir}/man1/amule*
 %{_mandir}/man1/ed2k*
-%{_mandir}/man1/xas*
 %lang(de) %{_mandir}/de/man1/amule*
 %lang(de) %{_mandir}/de/man1/ed2k*
-%lang(de) %{_mandir}/de/man1/xas*
 %lang(es) %{_mandir}/es/man1/amule*
 %lang(es) %{_mandir}/es/man1/ed2k*
-%lang(es) %{_mandir}/es/man1/xas*
 %lang(fr) %{_mandir}/fr/man1/amule*
 %lang(fr) %{_mandir}/fr/man1/ed2k*
 %lang(hu) %{_mandir}/hu/man1/amule*
 %lang(hu) %{_mandir}/hu/man1/ed2k*
-%lang(hu) %{_mandir}/hu/man1/xas*
 %lang(it) %{_mandir}/it/man1/amule*
 %lang(it) %{_mandir}/it/man1/ed2k*
+%lang(ru) %{_mandir}/ru/man1/amule*
+%lang(ru) %{_mandir}/ru/man1/ed2k*
+%lang(tr) %{_mandir}/tr/man1/amule*
+%lang(tr) %{_mandir}/tr/man1/ed2k*
 
 %files plugin-xchat
 %defattr(644,root,root,755)
 %{_libdir}/xchat/plugins/xas.pl
+%{_mandir}/man1/xas*
+%lang(de) %{_mandir}/de/man1/xas*
+%lang(es) %{_mandir}/es/man1/xas*
+%lang(fr) %{_mandir}/fr/man1/xas*
+%lang(hu) %{_mandir}/hu/man1/xas*
+%lang(it) %{_mandir}/it/man1/xas*
+%lang(ru) %{_mandir}/ru/man1/xas*
+%lang(tr) %{_mandir}/tr/man1/xas*
 
 %files alc
 %defattr(644,root,root,755)
@@ -185,6 +177,9 @@
 %lang(es) %{_mandir}/es/man1/alc*
 %lang(fr) %{_mandir}/fr/man1/alc*
 %lang(hu) %{_mandir}/hu/man1/alc*
+%lang(it) %{_mandir}/it/man1/alc*
+%lang(ru) %{_mandir}/ru/man1/alc*
+%lang(tr) %{_mandir}/tr/man1/alc*
 
 %files cas
 %defattr(644,root,root,755)
@@ -195,7 +190,11 @@
 %{_mandir}/man1/*cas*
 %lang(de) %{_mandir}/de/man1/*cas*
 %lang(es) %{_mandir}/es/man1/*cas*
+%lang(fr) %{_mandir}/fr/man1/*cas*
 %lang(hu) %{_mandir}/hu/man1/*cas*
+%lang(it) %{_mandir}/it/man1/*cas*
+%lang(ru) %{_mandir}/ru/man1/*cas*
+%lang(tr) %{_mandir}/tr/man1/*cas*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -203,6 +202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2012/02/05 17:20:04  tommat
+- updated for 2.3.1
+
 Revision 1.147  2012/02/01 21:47:56  arekm
 - release 25
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aMule/aMule-ac.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/aMule/aMule.spec?r1=1.147&r2=1.148&f=u

More information about the pld-cvs-commit mailing list