X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=aMule.spec;h=cf24d775f4fcda983bf03e79a892985b70663d26;hb=HEAD;hp=c08526d42426209706bf3e3ed6cc5ae8f5496503;hpb=fcab687ec4c903fc3dec900e8ccc482905b80a8b;p=packages%2FaMule.git

diff --git a/aMule.spec b/aMule.spec
index c08526d..e14fb31 100644
--- a/aMule.spec
+++ b/aMule.spec
@@ -4,18 +4,15 @@
 Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
-Version:	2.3.2
-Release:	22
+Version:	2.3.3
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
-# Source0-md5:	4516bde73327e6153c140cef59375f38
+# Source0-md5:	d74947f4c35bbea71369f6c112b9f0b8
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cas-datadir.patch
 Patch2:		%{name}-ac.patch
-Patch3:		%{name}-cryptopp.patch
-Patch4:		binutils-2.34.patch
-Patch5:		libupnp-1.14.patch
 URL:		http://www.amule.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf >= 2.59
@@ -29,13 +26,13 @@ BuildRequires:	expat-devel
 BuildRequires:	flex
 BuildRequires:	gd-devel >= 2.0.0
 BuildRequires:	gettext-tools >= 0.11.5
-BuildRequires:	gtk+2-devel >= 2:2.2.0
+BuildRequires:	gtk+3-devel
 BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libupnp-devel >= 1.6.6
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
-BuildRequires:	wxGTK2-unicode-devel >= 2.8.12
+BuildRequires:	wxGTK3-unicode-devel >= 2.8.12
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	zlib-devel >= 1.1.4
 Requires:	cryptopp >= 5.1
@@ -45,6 +42,7 @@ Requires:	wget
 Requires:	zlib >= 1.1.4
 Obsoletes:	lmule
 Obsoletes:	xmule
+Obsoletes:	aMule-plugin-xchat < 2.3.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,19 +51,6 @@ aMule is a Linux port of eMule client.
 %description -l pl.UTF-8
 aMule to linuksowy port klienta eMule.
 
-%package plugin-xchat
-Summary:	Xchat plugin
-Summary(pl.UTF-8):	Wtyczka dla xchat
-Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
-Provides:	%{name}-plugin-xchat
-
-%description plugin-xchat
-Plugin for Xchat IRC client.
-
-%description plugin-xchat -l pl.UTF-8
-Wtyczka dla klienta IRC xchat.
-
 %package alc
 Summary:	Ed2k link creator for aMule
 Summary(pl.UTF-8):	Kreator linków ed2k dla aMule
@@ -97,9 +82,6 @@ Narzędzie do generownia statystyk aMule.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 %{__aclocal} -I m4
@@ -110,7 +92,7 @@ export CXXFLAGS="%{rpmcxxflags} -std=gnu++14"
 %configure \
 	--with-denoise-level=1				\
 	--with-libpng-config=/usr/bin/libpng-config	\
-	--with-wx-config=wx-gtk2-unicode-config		\
+	--with-wx-config=wx-gtk3-unicode-config		\
 	--enable-alc					\
 	--enable-alcc					\
 	--enable-amulecmd				\
@@ -122,7 +104,7 @@ export CXXFLAGS="%{rpmcxxflags} -std=gnu++14"
 	--enable-optimize%{!?debug:=no}			\
 	--enable-webserver				\
 	--enable-wxcas					\
-	--enable-xas
+	--disable-xas
 
 %{__make}
 
@@ -144,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f amule.lang
 %defattr(644,root,root,755)
 %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
@@ -175,20 +156,6 @@ rm -rf $RPM_BUILD_ROOT
 %lang(zh_TW) %{_mandir}/zh_TW/man1/amule*.1*
 %lang(zh_TW) %{_mandir}/zh_TW/man1/ed2k.1*
 
-%files plugin-xchat
-%defattr(644,root,root,755)
-%{_libdir}/xchat/plugins/xas.pl
-%{_mandir}/man1/xas.1*
-%lang(de) %{_mandir}/de/man1/xas.1*
-%lang(es) %{_mandir}/es/man1/xas.1*
-%lang(fr) %{_mandir}/fr/man1/xas.1*
-%lang(hu) %{_mandir}/hu/man1/xas.1*
-%lang(it) %{_mandir}/it/man1/xas.1*
-%lang(ro) %{_mandir}/ro/man1/xas.1*
-%lang(ru) %{_mandir}/ru/man1/xas.1*
-%lang(tr) %{_mandir}/tr/man1/xas.1*
-%lang(zh_TW) %{_mandir}/zh_TW/man1/xas.1*
-
 %files alc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/alc