[packages/hatari] - updated to 2.5.0, subpackage ui

[qboosh]

commit 55dc34de9dabe69719857c3d795bf43fdd1bad02
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 22 15:48:00 2024 +0200

    - updated to 2.5.0, subpackage ui

 hatari-useless_files.patch | 10 ++++-----
 hatari.spec                | 52 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 18 deletions(-)
---
diff --git a/hatari.spec b/hatari.spec
index 3410d35..13dcc53 100644
--- a/hatari.spec
+++ b/hatari.spec
@@ -5,23 +5,27 @@
 Summary:	hatari - an Atari ST and STE emulator for Linux
 Summary(pl.UTF-8):	hatari - emulator Atari ST i STE dla Linuksa
 Name:		hatari
-Version:	2.3.1
+Version:	2.5.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://download.tuxfamily.org/hatari/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	52f572328edc575db17e54d4fd2d3a20
+# Source0-md5:	2af83f04ba9ca02a613f9d7c59d1fb72
 Patch0:		%{name}-useless_files.patch
 Patch1:		%{name}-desktop.patch
 URL:		http://hatari.tuxfamily.org/
 BuildRequires:	SDL2-devel >= 2.0
-BuildRequires:	cmake >= 3.3
+BuildRequires:	capstone-devel
+BuildRequires:	cmake >= 3.5
+BuildRequires:	gdk-pixbuf2 >= 2.0
+BuildRequires:	gtk+3 >= 3.0
 %{?with_capsimage:BuildRequires:	libcapsimage-devel >= 5}
 BuildRequires:	libpng-devel
 BuildRequires:	pkgconfig
 BuildRequires:	portaudio-devel
 BuildRequires:	portmidi-devel
 BuildRequires:	python3 >= 1:3
+BuildRequires:	python3-pygobject3 >= 3.0
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.577
@@ -49,6 +53,23 @@ Hatari jest emulatorem Atari ST i STE dla Linuksa i innych systemów
 obsługiwanych przez bibliotekę SDL. Hatari emuluje większość sprzętu
 Atari ST i STE.
 
+%package ui
+Summary:	Python/Gtk UI for Hatari
+Summary(pl.UTF-8):	Interfejs graficzny Python/Gtk dla Hatari
+Group:		Applications/Emulators
+Requires:	%{name} = %{version}-%{release}
+# gir files
+Requires:	glib2 >= 1:2.0
+Requires:	gdk-pixbuf2 >= 2.0
+Requires:	gtk+3 >= 3.0
+Requires:	python3-pygobject3 >= 3.0
+
+%description ui
+Python/Gtk UI for Hatari.
+
+%description ui -l pl.UTF-8
+Interfejs graficzny Python/Gtk dla Hatari.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -62,7 +83,8 @@ cd build
 %cmake .. \
 	-DBUILD_SHARED_LIBS:BOOL=OFF \
 	-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-	%{?with_sdl2:-DENABLE_SDL2=ON}
+	%{?with_sdl2:-DENABLE_SDL2=ON} \
+	-DPYTHON_EXECUTABLE=%{__python3}
 
 %{__make}
 
@@ -78,11 +100,7 @@ install doc/fr/hatari.1	$RPM_BUILD_ROOT%{_mandir}/fr/man1
 %py3_comp $RPM_BUILD_ROOT%{_datadir}/%{name}/hatariui
 %py3_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}/hatariui
 
-for f in README TODO ; do
-	%{__mv} python-ui/${f} python-ui/${f}-ui
-done
 %{__mv} tools/hconsole/{release-notes.txt,release-notes-hconsole.txt}
-%{__mv} python-ui/{release-notes.txt,release-notes-ui.txt}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,28 +117,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc readme.txt doc/{authors,changelog,emutos,keymap-sample,memory-usage,midi-linux,release-notes,todo}.txt doc/{compatibility,manual}.html tools/hconsole/release-notes-hconsole.txt python-ui/{README-ui,TODO-ui,release-notes-ui.txt}
+%doc readme.txt doc/{authors,changelog,emutos,keymap-sample,memory-usage,midi-linux,release-notes,todo}.txt doc/{compatibility,manual}.html tools/hconsole/release-notes-hconsole.txt
 %attr(755,root,root) %{_bindir}/atari-convert-dir
 %attr(755,root,root) %{_bindir}/atari-hd-image
 %attr(755,root,root) %{_bindir}/gst2ascii
 %attr(755,root,root) %{_bindir}/hatari
 %attr(755,root,root) %{_bindir}/hatari-prg-args
 %attr(755,root,root) %{_bindir}/hatari_profile
-%attr(755,root,root) %{_bindir}/hatariui
 %attr(755,root,root) %{_bindir}/hmsa
 %attr(755,root,root) %{_bindir}/zip2st
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/hconsole
+%{_datadir}/%{name}/hatari-icon.bmp
+%{_datadir}/%{name}/tos.img
 %{_mandir}/man1/atari-convert-dir.1*
 %{_mandir}/man1/atari-hd-image.1*
 %{_mandir}/man1/gst2ascii.1*
 %{_mandir}/man1/hatari-prg-args.1*
 %{_mandir}/man1/hatari_profile.1*
-%{_mandir}/man1/hatariui.1*
 %{_mandir}/man1/hconsole.1*
 %{_mandir}/man1/hmsa.1*
 %{_mandir}/man1/zip2st.1*
 %lang(fr) %{_mandir}/fr/man1/hatari.1*
-%{_desktopdir}/hatariui.desktop
 %{_desktopdir}/hatari.desktop
 %{_iconsdir}/hicolor/*/apps/hatari.*
 %{_iconsdir}/hicolor/*/mimetypes/application-x-st-disk-image.*
@@ -128,3 +146,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/mimetypes/application-vnd.msa-disk-image.*
 %{_iconsdir}/hicolor/*/mimetypes/application-x-stx-disk-image.*
 %{_datadir}/mime/packages/hatari.xml
+
+%files ui
+%defattr(644,root,root,755)
+%doc python-ui/{README,TODO,release-notes.txt}
+%attr(755,root,root) %{_bindir}/hatariui
+%{_datadir}/%{name}/hatariui
+%{_desktopdir}/hatariui.desktop
+%{_mandir}/man1/hatariui.1*
diff --git a/hatari-useless_files.patch b/hatari-useless_files.patch
index 0535b94..f83b3b6 100644
--- a/hatari-useless_files.patch
+++ b/hatari-useless_files.patch
@@ -1,6 +1,6 @@
---- hatari-2.3.1/CMakeLists.txt.orig	2020-12-26 22:50:12.000000000 +0100
-+++ hatari-2.3.1/CMakeLists.txt	2021-01-11 19:36:50.048045349 +0100
-@@ -311,10 +311,6 @@
+--- hatari-2.5.0/CMakeLists.txt.orig	2024-04-18 22:01:11.000000000 +0200
++++ hatari-2.5.0/CMakeLists.txt	2024-09-22 14:42:25.451059767 +0200
+@@ -329,10 +329,6 @@ if(NOT MANDIR)
  	set(MANDIR share/man/man1)
  endif()
  
@@ -11,11 +11,11 @@
  if(NOT ETCDIR)
  	if(WIN32)
  		set(ETCDIR .)
-@@ -342,7 +338,6 @@
+@@ -360,7 +356,6 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake
  		${CMAKE_BINARY_DIR}/config.h)
  
  add_subdirectory(src)
 -add_subdirectory(doc)
- add_subdirectory(tests)
  add_subdirectory(tools)
  
+ if(NOT CMAKE_CROSSCOMPILING)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hatari.git/commitdiff/55dc34de9dabe69719857c3d795bf43fdd1bad02