commit 93b4fb410f5b652f1899c3130f222c3358da2fbd Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Oct 6 16:05:04 2021 +0100 PR 298 from upstream to allow build with autoconf 2.71 Force build and install cryptopp >= 8.6.0 to avoid crashs gcc-c++ installs gcc by default 298.patch | 25 +++++++++++++++++++++++++ amule.spec | 16 +++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) --- diff --git a/298.patch b/298.patch new file mode 100644 index 0000000..05c0073 --- /dev/null +++ b/298.patch @@ -0,0 +1,25 @@ +From 40810d2fba2c2092efca84ed7f2017fddbb70ebd Mon Sep 17 00:00:00 2001 +From: Pablo Barciela <scow(a)riseup.net&gt; +Date: Sun, 19 Sep 2021 13:55:07 +0200 +Subject: [PATCH] allow to build with autoconf 2.70 and later + +Closes https://github.com/amule-project/amule/issues/232 +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 93a918c03..9c57668c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,10 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + + AC_PREREQ(2.62) + +-# autoconf 2.70 introduced some incompatibilities that will make the build fail +-# As a "workaround" reject 2.70 and above for now. +-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1],, [m4_fatal([autoconf ]m4_defn([AC_AUTOCONF_VERSION])[ is known to not work with aMule. Please use 2.69 instead.])]) +- + AC_CONFIG_SRCDIR([src/amule.cpp]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) diff --git a/amule.spec b/amule.spec index d01a12b..78fc82a 100644 --- a/amule.spec +++ b/amule.spec @@ -1,15 +1,15 @@ Name: amule Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: File sharing client compatible with eDonkey License: GPLv2+ Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi... Source2: %{name}.appdata.xml URL: http://amule.org -BuildRequires: gcc -BuildRequires: gcc-c++ +Patch1: 298.patch # See http://wiki.amule.org/wiki/Requirements +BuildRequires: gcc-c++ BuildRequires: wxGTK3-devel >= 0:2.8.7 BuildRequires: desktop-file-utils BuildRequires: binutils-devel @@ -21,7 +21,7 @@ BuildRequires: gettext-devel BuildRequires: flex BuildRequires: bison BuildRequires: readline-devel -BuildRequires: pkgconfig(cryptopp) +BuildRequires: pkgconfig(cryptopp) >= 8.6.0 BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(geoip) BuildRequires: libappstream-glib @@ -30,6 +30,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(ncurses) Requires: %{name}-nogui +Requires: cryptopp >= 8.6.0 %description aMule is an easy to use multi-platform client for ED2K Peer-to-Peer @@ -48,7 +49,7 @@ It is useful for servers which don't have Xorg. %prep -%autosetup +%autosetup -p1 %build # Downgrade to c++14 to avoid conflict with std::byte @@ -160,6 +161,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Wed Oct 06 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 2.3.3-4 +- PR 298 from upstream to allow build with autoconf 2.71 +- Force build and install cryptopp >= 8.6.0 to avoid crashs +- gcc-c++ installs gcc by default + * Tue Oct 05 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 2.3.3-3 - Rebuild for cryptopp update from 8.4.0 to 8.6.0