Request 6333 (accepted)

Overview

Request 6333 (accepted)

fix build with boost 1.89

Created by fstrba 5 months ago
In state accepted
Package maintainer: gcomes.pmbs

Submit aMule

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

aMule.changes Changed

aMule.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package aMule
 #
-# Copyright (c) 2021 Packman Team <packman@links2linux.de>
+# Copyright (c) 2025 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
@@ -24,8 +24,9 @@
 Group:          Productivity/Networking/Other
 URL:            https://www.amule.org
 #https://github.com/amule-project/amule
-Source:         %name-%version.tar.xz
-Patch:		FTBFS-%name-leap-15.6.patch
+Source0:        %{name}-%{version}.tar.xz
+Patch0:         FTBFS-%{name}-leap-15.6.patch
+Patch1:         %{name}-boost-1.89.patch
 BuildRequires:  binutils-devel
 BuildRequires:  cmake
 BuildRequires:  fdupes
@@ -33,19 +34,19 @@
 BuildRequires:  man-pages-ro
 BuildRequires:  mozilla-nspr
 BuildRequires:  pkgconfig
+BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  wxWidgets-3_2-nostl-devel
-%if 0%{?suse_version} == 1500
-BuildRequires:  libboost_headers1_75_0-devel
-%else
-BuildRequires:  boost-devel
-%endif
-BuildRequires:  readline-devel
 BuildRequires:  pkgconfig(cryptopp)
 BuildRequires:  pkgconfig(gdlib)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libupnp)
 Conflicts:      aMule-kde4
+%if 0%{?suse_version} == 1500
+BuildRequires:  libboost_headers1_75_0-devel
+%else
+BuildRequires:  boost-devel
+%endif
 
 %description
 aMule stand for another eMule file-sharing program, it is also
@@ -62,7 +63,7 @@
 # remove shebang
 sed -i '/^#!/d' src/utils/xas/xas.pl
 #override version only for source 2.3.3.20250105.4a1b78a2a
-if  %version == 2.3.3.20250105.4a1b78a2a ; then
+if  %{version} == 2.3.3.20250105.4a1b78a2a ; then
     sed -i '/VERSION "GIT"/s@.*@set (VERSION "2.3.3")\nset (SVNDATE "git 20250105")@' CMakeLists.txt
 fi
 
@@ -81,67 +82,67 @@
    -DBUILD_XAS=ON \
    -DENABLE_UPNP=ON \
    -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_INSTALL_DOCDIR=%_defaultdocdir/%name
+   -DCMAKE_INSTALL_DOCDIR=%{_defaultdocdir}/%{name}
 
-find /usr/include -type f -name "bmpbndl.h" -print
+find %{_includedir} -type f -name "bmpbndl.h" -print
 %cmake_build
 
 %install
 %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
+%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
 
-rm %buildroot%_defaultdocdir/%name/{INSTALL,license.txt}
+rm %{buildroot}%{_defaultdocdir}/%{name}/{INSTALL,license.txt}
 
-%find_lang %name --all-name --with-man
+%find_lang %{name} --all-name --with-man
 %if 0%{?suse_version} == 1500
-echo '%dir %_mandir/tr' >>%name.lang
+echo '%dir %{_mandir}/tr' >>%{name}.lang
 %endif
-%fdupes %buildroot
+%fdupes %{buildroot}
 
 %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
-%_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
+%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
+%{_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
 
 %changelog

aMule-boost-1.89.patch Added

Build Results
RPM Lint

Refresh

Comments for request 6333 0

Request History

fstrba created request 5 months ago

fix build with boost 1.89

gcomes.pmbs accepted request about 5 hours ago

Sorry for the late action, but I was not notified about the PR.
I'm accepting the PR although there are other compiling issues
that I'm going to fix immediately.