X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=aMule.spec;h=4a8b54b9d8dc1f83589c58deaccd585fde46988c;hb=caf71ed31e7c5c0a218da8b951cf1d5488af6539;hp=facbb86c728f7138dacc9f21d6c86c04fe13f47e;hpb=9c399e921cd61304675f05323808b39849c55afc;p=packages%2FaMule.git

diff --git a/aMule.spec b/aMule.spec
index facbb86..4a8b54b 100644
--- a/aMule.spec
+++ b/aMule.spec
@@ -1,14 +1,20 @@
+#
+# TODO: ./configure --enable-plasmamule
+#
 Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
-Version:	2.2.2
-Release:	2
+Version:	2.3.1
+Release:	18
 License:	GPL
 Group:		X11/Applications
-Source0:	http://download.berlios.de/amule/%{name}-%{version}.tar.bz2
-# Source0-md5:	4bbb5fef3b7acd206c08beddb7fdbb42
+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}-cxx.patch
+Patch4:		wxWidgets3.patch
 URL:		http://www.amule.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
@@ -19,12 +25,13 @@ BuildRequires:	cryptopp-devel >= 5.1
 BuildRequires:	curl-devel >= 7.9.7
 BuildRequires:	expat-devel
 BuildRequires:	gd-devel
-BuildRequires:	gettext-devel >= 0.11.5
 BuildRequires:	gettext-autopoint
+BuildRequires:	gettext-tools >= 0.11.5
 BuildRequires:	gtk+2-devel >= 2:2.2.0
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
-BuildRequires:	wxGTK2-unicode-devel
+BuildRequires:	pkgconfig
+BuildRequires:	wxGTK2-unicode-devel >= 2.8.12
 BuildRequires:	xorg-lib-libXpm-devel
 Requires:	wget
 Obsoletes:	lmule
@@ -80,6 +87,9 @@ Narzędzie do generownia statystyk aMule.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal} -I m4
@@ -88,20 +98,20 @@ 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				\
 	--enable-amule-gui				\
 	--enable-amulecmd				\
-	--enable-amulecmdgui				\
 	--enable-webserver				\
-	--enable-webservergui				\
 	--enable-cas					\
 	--enable-wxcas					\
 	--enable-alc					\
 	--enable-alcc					\
-	--enable-kad-compile				\
-	--enable-geoip
+	--enable-geoip					\
+	--enable-xas					\
+	--enable-optimize
 
 %{__make}
 
@@ -114,7 +124,8 @@ rm -rf $RPM_BUILD_ROOT
 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,}
-
+rm -fr $RPM_BUILD_ROOT%{_docdir}/amule
+rm -fr $RPM_BUILD_ROOT%{_mandir}/eu
 %find_lang amule
 
 %clean
@@ -122,7 +133,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f amule.lang
 %defattr(644,root,root,755)
-%doc docs/AUTHORS 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
 %dir %{_datadir}/amule
@@ -134,22 +146,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)
@@ -161,6 +183,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)
@@ -171,4 +196,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*