- up to 2.3.0

diff --git a/fceultra.spec b/fceultra.spec
index fa8dfee31c87abe9e7f0f9fe33d322bfdff11644..8ced5f05b7cc2ff23e4fe3d891cca67dca65ad46 100644 (file)
--- a/fceultra.spec
+++ b/fceultra.spec
@@ -1,26 +1,27 @@
 #
 # TODO: bcond for non-gtk gui (gfceux)
+# TODO: bcond for gtk3 interface instead of qt
 #
 Summary:       FCE Ultra - Linux Nintendo Entertainment System emulator
 Summary(pl.UTF-8):     FCE Ultra - linuksowy emulator systemu Nintendo
 Name:          fceultra
-Version:       2.2.1
+Version:       2.3.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://downloads.sourceforge.net/fceultra/fceux-%{version}.src.tar.gz
-# Source0-md5: 696d0186afb17f3b70d4aa9e9f5cf1d1
-Patch0:                lua51.patch
-Patch1:                format-security.patch
+# Source0-md5: 1d7588d6cd74fa6a0473e529a6f823d9
 URL:           http://fceultra.sourceforge.net/
-BuildRequires: OpenGL-GLU-devel
-BuildRequires: SDL >= 1.2.14
-BuildRequires: SDL_gfx-devel >= 1.2.14
-BuildRequires: gtk+2-devel
+BuildRequires: Mesa-libGLU-devel
+BuildRequires: Qt5Core-devel >= 5.11
+BuildRequires: Qt5Gui-devel >= 5.11
+BuildRequires: Qt5OpenGL-devel >= 5.11
+BuildRequires: Qt5Widgets-devel >= 5.11
+BuildRequires: SDL2 >= 2.0
+BuildRequires: cmake
+BuildRequires: lua51-devel
+BuildRequires: minizip-devel
 BuildRequires: pkgconfig
-BuildRequires: scons
-BuildRequires: zenity
-Requires:      zenity
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,27 +32,40 @@ FCE Ultra to wieloplatformowy emulator konsoli Famicom/NES/Pegasus.
 
 %prep
 %setup -q -n fceux-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
-CC="%{__cc}" \
-CXX="%{__cxx}" \
-CFLAGS="%{rpmcflags}" \
-LDFLAGS="%{rpmldflags}" \
-LIBS="-ldl" \
-%scons
+mkdir -p build
+%cmake --build=build \
+       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+       .
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+%{__make} install \
+        DESTDIR=$RPM_BUILD_ROOT
 
-cp -a bin/fceux $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_mandir}/man6/
+%{__mv} documentation/fceux.6 $RPM_BUILD_ROOT%{_mandir}/man6/
+%{__mv} documentation/fceux-net-server.6 $RPM_BUILD_ROOT%{_mandir}/man6/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Authors README-SDL TODO-SDL changelog.txt documentation
+%doc README TODO-SDL changelog.txt readme.md documentation/*
 %attr(755,root,root) %{_bindir}/fceux
+%dir %{_datadir}/fceux
+%dir %{_datadir}/fceux/luaScripts
+%dir %{_datadir}/fceux/palettes
+%dir %{_datadir}/fceux/tools
+%{_datadir}/fceux/*.{dll,chm}
+%{_datadir}/fceux/luaScripts/*
+%{_datadir}/fceux/palettes/*
+%{_datadir}/fceux/tools/*
+%{_mandir}/man6/fceux-net-server.6*
+%{_mandir}/man6/fceux.6*
+%{_pixmapsdir}/fceux1.png
+%{_desktopdir}/fceux.desktop

diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644 (file)
index 0cefb7f..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fceux-2.2.1/src/drivers/sdl/sdl.cpp~       2013-03-02 20:46:34.000000000 +0100
-+++ fceux-2.2.1/src/drivers/sdl/sdl.cpp        2013-07-14 20:06:36.493322816 +0200
-@@ -934,7 +934,7 @@
-       if(gtkIsStarted == true && noGui == 0)
-       {
-               GtkWidget* d;
--              d = gtk_message_dialog_new(GTK_WINDOW(MainWindow), GTK_DIALOG_MODAL,        GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, errormsg);
-+              d = gtk_message_dialog_new(GTK_WINDOW(MainWindow), GTK_DIALOG_MODAL,        GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", errormsg);
-               gtk_dialog_run(GTK_DIALOG(d));
-               gtk_widget_destroy(d);
-       }

diff --git a/lua51.patch b/lua51.patch
deleted file mode 100644 (file)
index 24a9d3c..0000000
--- a/lua51.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fceux-2.2.1/SConstruct~    2013-03-10 22:21:52.000000000 +0100
-+++ fceux-2.2.1/SConstruct     2013-07-14 20:04:15.261914050 +0200
-@@ -125,8 +125,8 @@
-       # Should work on any *nix
-       env.Append(CCFLAGS = ["-DLUA_USE_LINUX"])
-     lua_available = False
--    if conf.CheckLib('lua5.1'):
--      env.Append(LINKFLAGS = ["-ldl", "-llua5.1"])
-+    if conf.CheckLib('lua51'):
-+      env.Append(LINKFLAGS = ["-ldl", "-llua51"])
-       lua_available = True
-     elif conf.CheckLib('lua'):
-       env.Append(LINKFLAGS = ["-ldl", "-llua"])