From d8cfca4becdc4de194a61c61e5554d8d19a54b69 Mon Sep 17 00:00:00 2001 From: tommat Date: Sun, 5 Feb 2012 17:20:04 +0000 Subject: [PATCH] - updated for 2.3.1 Changed files: aMule-ac.patch -> 1.2 aMule.spec -> 1.148 --- aMule-ac.patch | 40 +++++++++++++-------------------- aMule.spec | 61 +++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 55 deletions(-) diff --git a/aMule-ac.patch b/aMule-ac.patch index 240facb..d24a773 100644 --- a/aMule-ac.patch +++ b/aMule-ac.patch @@ -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([[ diff --git a/aMule.spec b/aMule.spec index c7b711f..d8580bb 100644 --- a/aMule.spec +++ b/aMule.spec @@ -1,16 +1,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 @@ -24,7 +23,7 @@ BuildRequires: gd-devel 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 @@ -84,7 +83,6 @@ Narzędzie do generownia statystyk aMule. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %{__aclocal} -I m4 @@ -93,6 +91,7 @@ Narzędzie do generownia statystyk aMule. %{__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 \ @@ -103,21 +102,10 @@ Narzędzie do generownia statystyk aMule. --enable-wxcas \ --enable-alc \ --enable-alcc \ - --enable-geoip - -###################################################################################### -# 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 -###################################################################################### + --enable-geoip \ + --enable-xas \ + --enable-optimize + %{__make} %install @@ -126,10 +114,6 @@ rm -rf $RPM_BUILD_ROOT %{__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,} @@ -142,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -155,24 +139,32 @@ rm -rf $RPM_BUILD_ROOT %{_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) @@ -184,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT %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) @@ -194,4 +189,8 @@ rm -rf $RPM_BUILD_ROOT %{_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* -- 2.43.0