From eda33d0940b5f56345f98cc880bbef41792a256b Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 7 Jun 2017 17:10:16 +0200 Subject: [PATCH] - updated to 2.3.2 - removed obsolete cxx,wxWidgets3,build patches - obsolete ac patch replaced by new one, removing check for unnecessary autopoint tool --- aMule-ac.patch | 22 +++--- aMule-cxx.patch | 19 ------ aMule.spec | 172 ++++++++++++++++++++++++++++------------------- build.patch | 10 --- wxWidgets3.patch | 45 ------------- 5 files changed, 111 insertions(+), 157 deletions(-) delete mode 100644 aMule-cxx.patch delete mode 100644 build.patch delete mode 100644 wxWidgets3.patch diff --git a/aMule-ac.patch b/aMule-ac.patch index d24a773..e365c98 100644 --- a/aMule-ac.patch +++ b/aMule-ac.patch @@ -1,16 +1,10 @@ -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 +--- aMule-2.3.2/m4/nls.m4.orig 2016-09-16 09:55:06.000000000 +0200 ++++ aMule-2.3.2/m4/nls.m4 2017-06-07 15:45:13.860893406 +0200 +@@ -85,7 +85,6 @@ + AM_GNU_GETTEXT([no-libtool], [need-ngettext]) + AS_IF([test $USE_INCLUDED_LIBINTL = yes], [INCINTL=-I\${top_builddir}/intl]) -- CFLAGS+=" $LIBPNG_CFLAGS" -- LDFLAGS+=" $LIBPNG_LDFLAGS" -- LIBS+=" $LIBPNG_LIBS" -+ CFLAGS="$CFLAGS $LIBPNG_CFLAGS" -+ LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS" -+ LIBS="$LIBS $LIBPNG_LIBS" +- AS_IF([test x$USE_NLS = xyes], [MULE_CHECK_AUTOPOINT(, [USE_NLS=no])]) + AS_IF([test x$USE_NLS = xno -a x${enable_nls:-yes} = xyes], [MULE_WARNING([You need to install GNU gettext/gettext-tools to compile aMule with i18n support.])]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ + AS_IF([test ${USE_NLS:-no} = yes], [ diff --git a/aMule-cxx.patch b/aMule-cxx.patch deleted file mode 100644 index 20f734e..0000000 --- a/aMule-cxx.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- aMule-2.3.1/src/ObservableQueue.h.orig 2011-06-13 10:50:25.000000000 +0200 -+++ aMule-2.3.1/src/ObservableQueue.h 2012-09-11 20:32:12.755720386 +0200 -@@ -331,14 +331,14 @@ - template - void CObservableQueue::ObserverAdded( ObserverType* o ) - { -- NotifyObservers( EventType( EventType::STARTING ), o ); -+ this->NotifyObservers( EventType( EventType::STARTING ), o ); - } - - - template - void CObservableQueue::ObserverRemoved( ObserverType* o ) - { -- NotifyObservers( EventType( EventType::STOPPING ), o ); -+ this->NotifyObservers( EventType( EventType::STOPPING ), o ); - } - - diff --git a/aMule.spec b/aMule.spec index ca6e76b..61b7b54 100644 --- a/aMule.spec +++ b/aMule.spec @@ -1,40 +1,45 @@ # -# 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: 29 -License: GPL +Version: 2.3.2 +Release: 1 +License: GPL v2+ Group: X11/Applications Source0: http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2 -# Source0-md5: 31724290a440943f5b05d4dca413fe02 +# Source0-md5: 4516bde73327e6153c140cef59375f38 Patch0: %{name}-desktop.patch Patch1: %{name}-cas-datadir.patch Patch2: %{name}-ac.patch -Patch3: %{name}-cxx.patch -Patch4: wxWidgets3.patch -Patch5: build.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: libpng-devel >= 1.2.0 BuildRequires: libstdc++-devel -BuildRequires: pkgconfig +BuildRequires: libupnp-devel >= 1.6.6 +BuildRequires: pkgconfig >= 1:0.9.0 +BuildRequires: readline-devel BuildRequires: wxGTK2-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 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,7 +61,7 @@ Provides: %{name}-plugin-xchat Plugin for Xchat IRC client. %description plugin-xchat -l pl.UTF-8 -Wtczka dla klienta IRC xchat. +Wtyczka dla klienta IRC xchat. %package alc Summary: Ed2k link creator for aMule @@ -89,9 +94,6 @@ Narzędzie do generownia statystyk aMule. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build %{__aclocal} -I m4 @@ -99,21 +101,21 @@ Narzędzie do generownia statystyk aMule. %{__autoheader} %{__automake} %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-gtk2-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 \ + --enable-xas %{__make} @@ -145,60 +147,92 @@ 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* +%{_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 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/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* +%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* diff --git a/build.patch b/build.patch deleted file mode 100644 index 2e977f3..0000000 --- a/build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- aMule-2.3.1/src/LoggerConsole.cpp~ 2011-06-13 10:50:25.000000000 +0200 -+++ aMule-2.3.1/src/LoggerConsole.cpp 2015-04-11 10:58:20.592470541 +0200 -@@ -29,6 +29,7 @@ - - #include "Logger.h" // for Add(Debug)LogLineM() - -+DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE) - - #ifdef __DEBUG__ - bool CLogger::IsEnabled(DebugType /*type*/) const diff --git a/wxWidgets3.patch b/wxWidgets3.patch deleted file mode 100644 index 77568b1..0000000 --- a/wxWidgets3.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ur aMule-2.3.1/src/amuled.cpp aMule-2.3.1.wx3/src/amuled.cpp ---- aMule-2.3.1/src/amuled.cpp 2011-07-13 17:00:12.000000000 +0200 -+++ aMule-2.3.1.wx3/src/amuled.cpp 2014-01-19 13:55:50.904800356 +0100 -@@ -423,7 +423,9 @@ - #ifndef __WXMSW__ - - -+/* - static EndProcessDataMap endProcDataMap; -+*/ - - - int CDaemonAppTraits::WaitForChild(wxExecuteData &execData) -@@ -449,6 +451,7 @@ - wxSleep(1); - result = AmuleWaitPid(execData.pid, &status, WNOHANG, &msg); - if (result == 0) { -+ /* - // Add a WxEndProcessData entry to the map, so that we can - // support process termination - wxEndProcessData *endProcData = new wxEndProcessData(); -@@ -456,6 +459,7 @@ - endProcData->process = execData.process; - endProcData->tag = 0; - endProcDataMap[execData.pid] = endProcData; -+ */ - - status = execData.pid; - } else { -@@ -480,6 +484,7 @@ - msg << wxT("OnSignalChildHandler() has been called for child process with pid `") << - siginfo->si_pid << - wxT("'. "); -+/* - // Make sure we leave no zombies by calling waitpid() - int status = 0; - pid_t result = AmuleWaitPid(siginfo->si_pid, &status, WNOHANG, &msg); -@@ -503,6 +508,7 @@ - msg << wxT(" Error: the child process pid is not on the pid map."); - } - } -+*/ - - // Log our passage here - AddDebugLogLineN(logGeneral, msg); -- 2.43.0