[BasiliskII] Update to the latest commit made at 20250106

commit 4fbce00f0de9713c0fdfbcdad0da45e91d97e93c Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Feb 5 23:58:09 2025 +0000 Update to the latest commit made at 20250106 Minor cleanup .gitignore | 1 + BasiliskII.spec | 48 +++---- cxmon-3.2-fpermissive.patch | 161 ---------------------- cxmon-3.2-strfmt.patch | 12 -- macemu-work-around-ac_path_xtra-not-working.patch | 18 --- sources | 2 +- 6 files changed, 22 insertions(+), 220 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6c09151..c066ce0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ cxmon-3.2-cvs20130310.tar.gz macemu-master.zip BasiliskII-1.0-b58a926.tar.gz /BasiliskII-1.0-e273bb1.tar.gz +/BasiliskII-1.0-96e512b.tar.gz diff --git a/BasiliskII.spec b/BasiliskII.spec index b539156..fac245d 100644 --- a/BasiliskII.spec +++ b/BasiliskII.spec @@ -1,27 +1,28 @@ -%global commit e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da +%global commit 96e512bd6376e78a2869f16dcc8a9028bce5ee72 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%define date 20171001 +%define date 20250106 Summary: 68k Macintosh emulator Name: BasiliskII Version: 1.0 -Release: 0.%{date}.7%{?dist}.15 +Release: 0.%{date}.8%{?dist} License: GPLv2+ URL: http://basilisk.cebix.net/ Source0: https://github.com/cebix/macemu/archive/%{commit}/BasiliskII-1.0-%{shortc... Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.appdata.xml -# For some reason AC_PATH_XTRA does not work on the rpmfusion buildsys ? -# I've tried reproducing this with mock on both x86_64 and arm, without success -Patch1: macemu-work-around-ac_path_xtra-not-working.patch # Patch 10+ because these are for cxmon Patch10: cxmon-3.2-hide-symbols.patch -Patch11: cxmon-3.2-strfmt.patch -Patch12: cxmon-3.2-fpermissive.patch -BuildRequires: libtool gcc-c++ gtk2-devel -BuildRequires: desktop-file-utils libappstream-glib readline-devel -BuildRequires: libXt-devel libXxf86vm-devel SDL-devel +BuildRequires: libtool +BuildRequires: gcc-c++ +BuildRequires: gtk2-devel +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: readline-devel +BuildRequires: libXt-devel +BuildRequires: libXxf86vm-devel +BuildRequires: SDL-devel Requires: hicolor-icon-theme %description @@ -34,8 +35,8 @@ a Macintosh ROM image to use Basilisk II. %prep %autosetup -p1 -n macemu-%{commit} # cleanup -iconv -f ISO_8859-1 -t UTF8 %{name}/README > README -touch -r %{name}/README README +# iconv -f ISO_8859-1 -t UTF8 %{name}/README > README +# touch -r %{name}/README README iconv -f ISO_8859-1 -t UTF8 %{name}/ChangeLog > ChangeLog touch -r ChangeLog %{name}/ChangeLog sed -i 's/\r//' %{name}/src/Unix/tinyxml2.cpp @@ -51,7 +52,7 @@ pushd %{name}/src/Unix mkdir obj %configure --datadir=%{_sysconfdir} \ --disable-xf86-dga --enable-sdl-audio --with-bincue -make %{?_smp_mflags} +%make_build popd @@ -73,21 +74,8 @@ appstream-util validate-relax --nonet \ %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files -%doc ChangeLog README %{name}/TECH %{name}/TODO +%doc ChangeLog README.md %{name}/TECH %{name}/TODO %license %{name}/COPYING %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/%{name}/fbdevices @@ -101,6 +89,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Feb 05 2025 Sérgio Basto <sergio(a)serjux.com&gt; - 1.0-0.20250106.8 +- Update to the latest commit made at 20250106 +- Minor cleanup + * Tue Jan 28 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.0-0.20171001.7.15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 802030b..548a350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6ecf5c991bd60dd38f03cf47bc3d07b BasiliskII-1.0-e273bb1.tar.gz +SHA512 (BasiliskII-1.0-96e512b.tar.gz) = 33c08f0032599396fd389a2462baad31f3903fe90394498977fd1d7385eb1bc1bcdc28dea4d6aa1f4c13dc39e2dcc341fdd8900b9e9473956c868978963e928e