- updated to 2.3.1

- updated useless_files,desktop patches
- removed outdated python_init patch (python3 is used now)
- use just SDL2, there is no switch to select SDL 1.2 is SDL2 is found

diff --git a/hatari-desktop.patch b/hatari-desktop.patch
index 7a5fec759e3b9857c70a036f9bfa949d9555e211..bbc79e3464d0340f818746228e193a2ae2ba0611 100644 (file)
--- a/hatari-desktop.patch
+++ b/hatari-desktop.patch
@@ -1,19 +1,20 @@
---- hatari-1.9.0/share/applications/hatari.desktop     2015-09-10 23:16:03.000000000 +0200
-+++ hatari-1.9.0/share/applications/hatari.desktop.new 2015-11-08 22:02:18.667818758 +0100
-@@ -7,5 +7,5 @@
+--- hatari-2.3.1/share/applications/hatari.desktop.orig        2021-01-11 19:37:11.294596914 +0100
++++ hatari-2.3.1/share/applications/hatari.desktop     2021-01-11 19:40:28.446862182 +0100
+@@ -6,6 +6,6 @@
  Exec=hatari %f
  Icon=hatari
- MimeType=application/x-st-disk-image;application/vnd.msa-disk-image;application/vnd.fastcopy-disk-image;application/x-stx-disk-image
+ MimeType=application/x-st-disk-image;application/vnd.msa-disk-image;application/vnd.fastcopy-disk-image;application/x-stx-disk-image;
 -Categories=Game;Emulator;
 +Categories=Utility;Emulator;
+ Keywords=Emulator;Atari;Atari ST;Atari Falcon;
  Terminal=false
---- hatari-1.9.0/python-ui/hatariui.desktop    2015-09-10 23:16:03.000000000 +0200
-+++ hatari-1.9.0/python-ui/hatariui.desktop.new        2015-11-08 22:00:08.741704673 +0100
-@@ -5,3 +5,7 @@
- Name=Hatari UI
+--- hatari-2.3.1/python-ui/hatariui.desktop.orig       2021-01-11 19:37:11.294596914 +0100
++++ hatari-2.3.1/python-ui/hatariui.desktop    2021-01-11 19:41:11.523295483 +0100
+@@ -6,6 +6,6 @@
  Exec=hatariui
  Icon=hatari
-+Keywords=virtualization
+ StartupNotify=true
+-Categories=Game;Emulator;
 +Categories=Utility;Emulator;
-+Comment=UI for hatari, emulator of Atari ST/STE/Falcon computers
-+
+ Keywords=Emulator;Atari;Atari ST;Atari Falcon;
+ Terminal=false

diff --git a/hatari-python_init.patch b/hatari-python_init.patch
deleted file mode 100644 (file)
index d30da9a..0000000
--- a/hatari-python_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hatari-1.5.0/python-ui/hatariui.orig       2011-07-19 00:32:26.000000000 +0200
-+++ hatari-1.5.0/python-ui/hatariui    2011-07-23 10:05:56.946083979 +0200
-@@ -6,7 +6,7 @@
- path=${0%/*}
- name=${0##*/}
- 
--if [ ! -e $path/$name.py ]; then
-+if [ ! -e $path/$name.pyc ]; then
-       # Assume package has been relocated, try relative data directory:
-       path=${0%/*}/../share/hatari/hatariui
- fi

diff --git a/hatari-useless_files.patch b/hatari-useless_files.patch
index 3532d4c9d31849247548609ce77ce2944a4b7571..0535b94f3ce43e8a3d6defd54f33d63c07220fde 100644 (file)
--- a/hatari-useless_files.patch
+++ b/hatari-useless_files.patch
@@ -1,6 +1,6 @@
---- hatari-1.5.0/CMakeLists.txt.orig   2011-07-19 00:32:26.000000000 +0200
-+++ hatari-1.5.0/CMakeLists.txt        2011-07-23 09:53:31.982725700 +0200
-@@ -220,10 +220,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 @@
        set(MANDIR share/man/man1)
  endif()
  
@@ -11,11 +11,11 @@
  if(NOT ETCDIR)
        if(WIN32)
                set(ETCDIR .)
-@@ -241,7 +237,6 @@
+@@ -342,7 +338,6 @@
                ${CMAKE_BINARY_DIR}/config.h)
  
  add_subdirectory(src)
 -add_subdirectory(doc)
+ add_subdirectory(tests)
  add_subdirectory(tools)
  
- include(FindPythonInterp)

diff --git a/hatari.spec b/hatari.spec
index 730735110d63dcfb7805c501f9d672833e34a335..3410d35b2fdc3d5fba1a42f5c63cf7b22c7c2e89 100644 (file)
--- a/hatari.spec
+++ b/hatari.spec
@@ -1,37 +1,42 @@
 #
 # Conditional build:
-%bcond_with    sdl2            # use SDL 2 instead of 1.2
 %bcond_with    capsimage       # use capsimage for .IPF, .RAW and .CTR disk image support
 #
 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.1.0
+Version:       2.3.1
 Release:       1
 License:       GPL v2+
 Group:         Applications/Emulators
 Source0:       http://download.tuxfamily.org/hatari/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: f9c4b73695b28e7cf715373e88e4f683
+# Source0-md5: 52f572328edc575db17e54d4fd2d3a20
 Patch0:                %{name}-useless_files.patch
-Patch1:                %{name}-python_init.patch
-Patch2:                %{name}-desktop.patch
-URL:           http://hatari.sourceforge.net/
-%{!?with_sdl2:BuildRequires:   SDL-devel >= 1.2.0}
-%{?with_sdl2:BuildRequires:    SDL2-devel >= 2.0}
-BuildRequires: cmake >= 2.6
-%{?with_capsimage:BuildRequires:       libcapsimage-devel >= 4}
+Patch1:                %{name}-desktop.patch
+URL:           http://hatari.tuxfamily.org/
+BuildRequires: SDL2-devel >= 2.0
+BuildRequires: cmake >= 3.3
+%{?with_capsimage:BuildRequires:       libcapsimage-devel >= 5}
 BuildRequires: libpng-devel
 BuildRequires: pkgconfig
 BuildRequires: portaudio-devel
-BuildRequires: python >= 2
+BuildRequires: portmidi-devel
+BuildRequires: python3 >= 1:3
 BuildRequires: readline-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.577
 BuildRequires: sed >= 4.0
+BuildRequires: udev-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
-Requires:      python >= 1:2.4
-Requires:      python-pygtk-gtk >= 2:2.8
+%{!?with_capsimage:BuildConflicts:     libcapsimage-devel}
+Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
+Requires:      gtk+3 >= 3.0
+Requires:      hicolor-icon-theme
+Requires:      python3 >= 1:3.2
+Requires:      python3-pygobject3 >= 3
+Requires:      shared-mime-info
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,9 +53,8 @@ Atari ST i STE.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-sed -i -e '1s,#!/usr/bin/env python,#!/usr/bin/python,' python-ui/*.py tools/debugger/*.py tools/hconsole/*.py
+%{__sed} -i -e '1s,#!/usr/bin/env python3,#!%{__python3},' python-ui/*.py tools/*.py tools/debugger/*.py tools/hconsole/*.py
 
 %build
 install -d build
@@ -71,9 +75,8 @@ install -d $RPM_BUILD_ROOT%{_mandir}/fr/man1
 
 install doc/fr/hatari.1        $RPM_BUILD_ROOT%{_mandir}/fr/man1
 
-%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}/hatariui
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}/hatariui
-%py_postclean %{_datadir}/%{name}/hatariui
+%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
@@ -84,26 +87,38 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_desktop_database
+%update_icon_cache hicolor
+%update_mime_database
+
+%postun
+%update_desktop_database
+%update_icon_cache hicolor
+%update_mime_database
+
 %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}
+%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
-%attr(755,root,root) %{_bindir}/atari-convert-dir
-%attr(755,root,root) %{_bindir}/gst2ascii
-%attr(755,root,root) %{_bindir}/hatari_profile.py
 %{_datadir}/%{name}
+%{_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*
-%{_mandir}/man1/atari-convert-dir.1*
-%{_mandir}/man1/gst2ascii.1*
-%{_mandir}/man1/hatari_profile.1*
 %lang(fr) %{_mandir}/fr/man1/hatari.1*
 %{_desktopdir}/hatariui.desktop
 %{_desktopdir}/hatari.desktop