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

diff --git a/aMule.spec b/aMule.spec
index 4a8b54b..e14fb31 100644
--- a/aMule.spec
+++ b/aMule.spec
@@ -1,41 +1,48 @@
 #
-# TODO: ./configure --enable-plasmamule
+# TODO: ./configure --enable-plasmamule (BR: qt4-build, QtCore 4, KDE 4)
 #
 Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
-Version:	2.3.1
-Release:	18
-License:	GPL
+Version:	2.3.3
+Release:	3
+License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
-# Source0-md5:	31724290a440943f5b05d4dca413fe02
+# Source0-md5:	d74947f4c35bbea71369f6c112b9f0b8
 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
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.7.3
 BuildRequires:	binutils-devel
 BuildRequires:	bison
+BuildRequires:	boost-devel >= 1.47
 BuildRequires:	cryptopp-devel >= 5.1
 BuildRequires:	curl-devel >= 7.9.7
 BuildRequires:	expat-devel
-BuildRequires:	gd-devel
-BuildRequires:	gettext-autopoint
+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:	pkgconfig
-BuildRequires:	wxGTK2-unicode-devel >= 2.8.12
+BuildRequires:	libupnp-devel >= 1.6.6
+BuildRequires:	pkgconfig >= 1:0.9.0
+BuildRequires:	readline-devel
+BuildRequires:	wxGTK3-unicode-devel >= 2.8.12
 BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	zlib-devel >= 1.1.4
+Requires:	cryptopp >= 5.1
+Requires:	gd >= 2.0.0
+Requires:	libupnp >= 1.6.6
 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
@@ -44,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
-Wtczka dla klienta IRC xchat.
-
 %package alc
 Summary:	Ed2k link creator for aMule
 Summary(pl.UTF-8):	Kreator linków ed2k dla aMule
@@ -88,30 +82,29 @@ Narzędzie do generownia statystyk aMule.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+export CXXFLAGS="%{rpmcxxflags} -std=gnu++14"
 %configure \
-	--with-wx-config=wx-gtk2-unicode-config		\
+	--with-denoise-level=1				\
 	--with-libpng-config=/usr/bin/libpng-config	\
-	--%{?debug:en}%{!?debug:dis}able-debug		\
-	--%{?debug:dis}%{!?debug:en}able-optimize	\
+	--with-wx-config=wx-gtk3-unicode-config		\
+	--enable-alc					\
+	--enable-alcc					\
+	--enable-amulecmd				\
 	--enable-amule-daemon				\
 	--enable-amule-gui				\
-	--enable-amulecmd				\
-	--enable-webserver				\
 	--enable-cas					\
-	--enable-wxcas					\
-	--enable-alc					\
-	--enable-alcc					\
+	--enable-debug%{!?debug:=no}			\
 	--enable-geoip					\
-	--enable-xas					\
-	--enable-optimize
+	--enable-optimize%{!?debug:=no}			\
+	--enable-webserver				\
+	--enable-wxcas					\
+	--disable-xas
 
 %{__make}
 
@@ -121,11 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$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
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/et{_EE,}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/ko{_KR,}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/amule
 %find_lang amule
 
 %clean
@@ -134,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
@@ -144,60 +135,78 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/amulegui.desktop
 %{_pixmapsdir}/amule.xpm
 %{_pixmapsdir}/amulegui.xpm
-%{_mandir}/man1/amule*
-%{_mandir}/man1/ed2k*
-%lang(de) %{_mandir}/de/man1/amule*
-%lang(de) %{_mandir}/de/man1/ed2k*
-%lang(es) %{_mandir}/es/man1/amule*
-%lang(es) %{_mandir}/es/man1/ed2k*
-%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(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*
+%{_mandir}/man1/amule*.1*
+%{_mandir}/man1/ed2k.1*
+%lang(de) %{_mandir}/de/man1/amule*.1*
+%lang(de) %{_mandir}/de/man1/ed2k.1*
+%lang(es) %{_mandir}/es/man1/amule*.1*
+%lang(es) %{_mandir}/es/man1/ed2k.1*
+%lang(fr) %{_mandir}/fr/man1/amule*.1*
+%lang(fr) %{_mandir}/fr/man1/ed2k.1*
+%lang(hu) %{_mandir}/hu/man1/amule*.1*
+%lang(hu) %{_mandir}/hu/man1/ed2k.1*
+%lang(it) %{_mandir}/it/man1/amule*.1*
+%lang(it) %{_mandir}/it/man1/ed2k.1*
+%lang(ro) %{_mandir}/ro/man1/amule*.1*
+%lang(ro) %{_mandir}/ro/man1/ed2k.1*
+%lang(ru) %{_mandir}/ru/man1/amule*.1*
+%lang(ru) %{_mandir}/ru/man1/ed2k.1*
+%lang(tr) %{_mandir}/tr/man1/amule*.1*
+%lang(tr) %{_mandir}/tr/man1/ed2k.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/amule*.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/ed2k.1*
 
 %files alc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/alc*
+%attr(755,root,root) %{_bindir}/alc
+%attr(755,root,root) %{_bindir}/alcc
 %{_desktopdir}/alc.desktop
 %{_pixmapsdir}/alc.xpm
-%{_mandir}/man1/alc*
-%lang(de) %{_mandir}/de/man1/alc*
-%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*
+%{_mandir}/man1/alc.1*
+%{_mandir}/man1/alcc.1*
+%lang(de) %{_mandir}/de/man1/alc.1*
+%lang(de) %{_mandir}/de/man1/alcc.1*
+%lang(es) %{_mandir}/es/man1/alc.1*
+%lang(es) %{_mandir}/es/man1/alcc.1*
+%lang(fr) %{_mandir}/fr/man1/alc.1*
+%lang(fr) %{_mandir}/fr/man1/alcc.1*
+%lang(hu) %{_mandir}/hu/man1/alc.1*
+%lang(hu) %{_mandir}/hu/man1/alcc.1*
+%lang(it) %{_mandir}/it/man1/alc.1*
+%lang(it) %{_mandir}/it/man1/alcc.1*
+%lang(ro) %{_mandir}/ro/man1/alc.1*
+%lang(ro) %{_mandir}/ro/man1/alcc.1*
+%lang(ru) %{_mandir}/ru/man1/alc.1*
+%lang(ru) %{_mandir}/ru/man1/alcc.1*
+%lang(tr) %{_mandir}/tr/man1/alc.1*
+%lang(tr) %{_mandir}/tr/man1/alcc.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/alc.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/alcc.1*
 
 %files cas
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*cas
+%attr(755,root,root) %{_bindir}/cas
+%attr(755,root,root) %{_bindir}/wxcas
 %{_datadir}/amule/cas
-%{_desktopdir}/*cas.desktop
+%{_desktopdir}/wxcas.desktop
 %{_pixmapsdir}/wxcas.xpm
-%{_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*
+%{_mandir}/man1/cas.1*
+%{_mandir}/man1/wxcas.1*
+%lang(de) %{_mandir}/de/man1/cas.1*
+%lang(de) %{_mandir}/de/man1/wx*cas.1*
+%lang(es) %{_mandir}/es/man1/cas.1*
+%lang(es) %{_mandir}/es/man1/wxcas.1*
+%lang(fr) %{_mandir}/fr/man1/cas.1*
+%lang(fr) %{_mandir}/fr/man1/wxcas.1*
+%lang(hu) %{_mandir}/hu/man1/cas.1*
+%lang(hu) %{_mandir}/hu/man1/wxcas.1*
+%lang(it) %{_mandir}/it/man1/cas.1*
+%lang(it) %{_mandir}/it/man1/wxcas.1*
+%lang(ro) %{_mandir}/ro/man1/cas.1*
+%lang(ro) %{_mandir}/ro/man1/wxcas.1*
+%lang(ru) %{_mandir}/ru/man1/cas.1*
+%lang(ru) %{_mandir}/ru/man1/wxcas.1*
+%lang(tr) %{_mandir}/tr/man1/cas.1*
+%lang(tr) %{_mandir}/tr/man1/wxcas.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/cas.1*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/wxcas.1*