Request 5381 (accepted)

This request supersedes: request 5380 (Show diff)

Overview

Request 5381 (accepted)

Update to version 2.3.3.20210426.6d4c03b00

Created by Aloysius over 3 years ago
In state accepted
Package maintainer: gcomes.pmbs
Supersedes 5380

Submit aMule

Submit package home:Aloysius:branches:Extra / aMule to package Extra / aMule

aMule.changes Changed

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Mon Apr 26 07:44:59 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 2.3.3.20210426.6d4c03b00 (see Changelog for
+  more details)
+  * CMake support. CMake provides us platform-independent
+    configuration files and generates native makefiles and
+    workspaces for the compiler of your choice. It's highly
+    experimental in its current state, but it aims to take the
+    place of good old autoconf/automake one day.
+  * Command completion with the TAB key in amulecmd.
+  * Supports compilation with the latest C++ standard (C++17).
+  * Scope graphs now (should) work on Mac.
+  * Notification when a download completes.
+  Requirements:
+  * For UPnP you need at least libupnp-1.6.7.
+  * For C++17 you need at least Cryptopp-6.0.0.
+  * For notifications you need at least wxWidgets-2.9.0.
+- Add -lang subpackage
+- Switch build to cmake
+- Spec cleanup
+
+-------------------------------------------------------------------
 Mon Dec 14 19:09:13 UTC 2020 - Fridrich Strba <fridrich.strba@bluewin.ch>
 
 - Update to version 2.3.2.20201016.9fd038f82

aMule.spec Changed

@@ -1,6 +1,8 @@
 #
 # spec file for package aMule
 #
+# Copyright (c) 2021 Packman Team <packman@links2linux.de>
+#
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
@@ -10,38 +12,34 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
 
 Name:           aMule
-Version:        2.3.2.20201016.9fd038f82
+Version:        2.3.3.20210426.6d4c03b00
 Release:        0
 Summary:        Another eMule file-sharing program
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Other
-Url:            http://www.amule.org
+URL:            https://www.amule.org
 #https://github.com/amule-project/amule
 Source:         %{name}-%{version}.tar.xz
-BuildRequires:  autoconf
-BuildRequires:  automake >= 1.9
 BuildRequires:  binutils-devel
+BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+%if 0%{?suse_version} > 1500
+BuildRequires:  man-pages-ro
+%endif
 BuildRequires:  mozilla-nspr
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  wxWidgets-3_0-nostl-devel
 BuildRequires:  pkgconfig(cryptopp)
 BuildRequires:  pkgconfig(gdlib)
-%if 0%{?suse_version} < 1500
-BuildRequires:  pkgconfig(geoip)
-%endif
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libupnp)
-%if 0%{?suse_version} < 1500
-Requires:       GeoIP
-%endif
 Conflicts:      aMule-kde4
 
 %description
@@ -50,75 +48,87 @@
 to eDonkey2000 network, supports Linux, *BSD platforms, and has
 a new vision of the GUI.
 
+%lang_package
+
 %prep
 %autosetup -p1
+# remove shebang
+sed -i '/^#!/d' src/utils/xas/xas.pl
 
 %build
-./autogen.sh
-%configure \
-%if 0%{?suse_version} < 1500
-  --enable-geoip \
-%endif
-  --enable-monolithic \
-  --enable-amule-daemon \
-  --enable-amulecmd \
-  --enable-webserver \
-  --enable-amule-gui \
-  --enable-cas \
-  --enable-wxcas \
-  --enable-ed2k \
-  --enable-alc \
-  --enable-alcc \
-  --enable-xas \
-  --enable-fileview \
-  --disable-static \
-  --enable-upnp \
-  --disable-debug \
-  --disable-profile \
-  --enable-optimize \
-  --disable-ccache \
-  --enable-mmap
-
-make %{?_smp_mflags} V=1
+%cmake \
+   -DBUILD_MONOLITHIC=ON \
+   -DBUILD_DAEMON=ON \
+   -DBUILD_AMULECMD=ON \
+   -DBUILD_WEBSERVER=ON \
+   -DBUILD_REMOTEGUI=ON \
+   -DBUILD_CAS=ON \
+   -DBUILD_WXCAS=ON \
+   -DBUILD_ED2K=ON \
+   -DBUILD_ALC=ON \
+   -DBUILD_ALCC=ON \
+   -DBUILD_XAS=ON \
+   -DBUILD_FILEVIEW=ON \
+   -DENABLE_UPNP=ON \
+   -DCMAKE_INSTALL_DOCDIR=%{_defaultdocdir}/%{name}
+%cmake_build
 
 %install
-%make_install docdir=%{_defaultdocdir}/aMule.xxx
-rm -rfv %{buildroot}/%{_defaultdocdir}/aMule.xxx
+%cmake_install
 
 %suse_update_desktop_file -G "P2P Client" -i amule Network P2P
-%suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/alc.desktop
-%suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/amulegui.desktop
-%suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/wxcas.desktop
-
-#tar -xf %%{SOURCE1} -C %%{buildroot}%%{_datadir}/amule/
-#mv %%{buildroot}%%{_datadir}/amule/amule__icon.png %%{buildroot}%%{_datadir}/pixmaps/amule.png
+%suse_update_desktop_file  %{buildroot}%{_datadir}/applications/alc.desktop
+%suse_update_desktop_file  %{buildroot}%{_datadir}/applications/amulegui.desktop
+%suse_update_desktop_file  %{buildroot}%{_datadir}/applications/wxcas.desktop
 
-# Don't overwrite system locale.alias
-rm -f %{buildroot}%{_datadir}/locale/locale.alias
+rm %{buildroot}%{_defaultdocdir}/%{name}/{INSTALL,license.txt}
 
-%find_lang amule
+%find_lang %{name} --all-name --with-man
+%fdupes %{buildroot}
 
-%fdupes -s %{buildroot}
-
-%files -f amule.lang
-%defattr(-,root,root)
-%doc docs/AUTHORS docs/Changelog docs/README docs/license.txt
-%{_mandir}/*/*
-%{_bindir}/*
-%{_libdir}/xchat/plugins/xas.pl
-%{_datadir}/amule/*
-%{_datadir}/cas/*
-%{_datadir}/locale/*/LC_MESSAGES/*
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/*
+%files
+%license docs/license.txt
+%doc docs/AUTHORS
+%doc %{_defaultdocdir}/*
+%{_bindir}/alc
+%{_bindir}/alcc
+%{_bindir}/amule
+%{_bindir}/amulecmd
+%{_bindir}/amuled
+%{_bindir}/amulegui
+%{_bindir}/amuleweb
+%{_bindir}/autostart-xas
+%{_bindir}/cas
+%{_bindir}/ed2k
+%{_bindir}/fileview
+%{_bindir}/wxcas
+%dir %{_datadir}/amule
+%{_datadir}/amule/skins
+%{_datadir}/amule/webserver
+%{_datadir}/applications/alc.desktop
+%{_datadir}/applications/amule.desktop
+%{_datadir}/applications/amulegui.desktop
+%{_datadir}/applications/wxcas.desktop
+%{_datadir}/cas
+%{_datadir}/pixmaps/*.xpm
 %dir %{_libdir}/xchat
 %dir %{_libdir}/xchat/plugins
-%dir %{_datadir}/amule
-%dir %{_datadir}/cas
-%dir %{_mandir}/ro
+%{_libdir}/xchat/plugins/xas.pl
+%{_mandir}/man1/alc.1%{?ext_man}
+%{_mandir}/man1/alcc.1%{?ext_man}
+%{_mandir}/man1/amule.1%{?ext_man}
+%{_mandir}/man1/amulecmd.1%{?ext_man}
+%{_mandir}/man1/amuled.1%{?ext_man}
+%{_mandir}/man1/amulegui.1%{?ext_man}
+%{_mandir}/man1/amuleweb.1%{?ext_man}
+%{_mandir}/man1/cas.1%{?ext_man}
+%{_mandir}/man1/ed2k.1%{?ext_man}
+%{_mandir}/man1/wxcas.1%{?ext_man}
+%{_mandir}/man1/xas.1%{?ext_man}
+
+%files lang -f %{name}.lang
+%if 0%{?suse_version} > 1500
 %dir %{_mandir}/tr
-%dir %{_mandir}/hu
-%exclude %{_bindir}/plasmamule-engine-feeder
-%exclude %{_datadir}/applications/plasmamule-engine-feeder.desktop
+%endif
 
 %changelog

_service Changed

aMule-2.3.2.20201016.9fd038f82.tar.xz Deleted

aMule-2.3.3.20210426.6d4c03b00.tar.xz Added

Build Results
RPM Lint

Refresh

Comments for request 5381 0

Request History

Aloysius created request over 3 years ago

Update to version 2.3.3.20210426.6d4c03b00

Aloysius accepted request over 3 years ago