From 1305b20cdced42be918b0f14d6f8a350ae32b0c2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Aug 11 2016 14:56:09 +0000 Subject: New upstream release 0.13.0 (rhbz#1353901) - Include catapult graphical frontend (in a new -catapult subpackage) - Move .desktop file to the -catapult subpackage and make it launch Catapult --- diff --git a/.gitignore b/.gitignore index 219e280..65d74c4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ openmsx-0.7.2.tar.gz /openmsx-0.10.1.tar.gz /openmsx-0.11.0.tar.gz /openmsx-0.12.0.tar.gz +/openmsx-0.13.0.tar.gz +/openmsx-catapult-0.13.0.tar.gz diff --git a/openmsx-0.12.0-gcc6.patch b/openmsx-0.12.0-gcc6.patch deleted file mode 100644 index f622cc5..0000000 --- a/openmsx-0.12.0-gcc6.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up openmsx-0.12.0/src/RTScheduler.cc~ openmsx-0.12.0/src/RTScheduler.cc ---- openmsx-0.12.0/src/RTScheduler.cc~ 2015-09-14 18:18:18.000000000 +0200 -+++ openmsx-0.12.0/src/RTScheduler.cc 2016-02-21 11:07:59.539881004 +0100 -@@ -1,6 +1,7 @@ - #include "RTScheduler.hh" - #include "RTSchedulable.hh" - #include -+#include - #include - - namespace openmsx { -diff -up openmsx-0.12.0/src/video/ZMBVEncoder.cc~ openmsx-0.12.0/src/video/ZMBVEncoder.cc ---- openmsx-0.12.0/src/video/ZMBVEncoder.cc~ 2015-09-14 18:18:18.000000000 +0200 -+++ openmsx-0.12.0/src/video/ZMBVEncoder.cc 2016-02-21 11:08:00.427885378 +0100 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - namespace openmsx { - diff --git a/openmsx.spec b/openmsx.spec index fc9491a..d4744d1 100644 --- a/openmsx.spec +++ b/openmsx.spec @@ -1,13 +1,13 @@ Name: openmsx -Version: 0.12.0 +Version: 0.13.0 Release: 1%{?dist} Summary: An emulator for the MSX home computer system Group: Applications/Emulators License: GPL+ URL: http://openmsx.org/ -Source0: https://github.com/openMSX/openMSX/releases/download/RELEASE_0_12_0/%{name}-%{version}.tar.gz +Source0: https://github.com/openMSX/openMSX/releases/download/RELEASE_0_13_0/%{name}-%{version}.tar.gz +Source1: https://github.com/openMSX/openMSX/releases/download/RELEASE_0_13_0/%{name}-catapult-%{version}.tar.gz Patch0: openmsx-0.6.1-installbase.patch -Patch1: openmsx-0.12.0-gcc6.patch BuildRequires: desktop-file-utils libappstream-glib BuildRequires: docbook-utils BuildRequires: glew-devel >= 1.3.2 @@ -20,6 +20,8 @@ BuildRequires: zlib-devel BuildRequires: python BuildRequires: libvorbis-devel BuildRequires: libtheora-devel +BuildRequires: alsa-lib-devel +BuildRequires: wxGTK-devel Requires: cbios-%{name} Requires: hicolor-icon-theme @@ -28,32 +30,62 @@ openMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. +%package catapult +Summary: Graphical interface for openMSX +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description catapult +openMSX Catapult is a graphical user interface for openMSX. +Although the program should be self explanatory, we included a set of HTML +manuals, that tell how to use Catapult with openMSX. To understand what all +options mean and to get a better feeling of what openMSX is, we also recommend +to read the documentation of openMSX. + + %prep -%setup -q +%setup -q -a 1 %patch0 -p1 -%patch1 -p1 - -# Verbose compilation -sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk # Make the custom flavour module, so we can use RPM OPT FLAGS here cat > build/flavour-rpm.mk << EOF -# $Id: flavour-rpm.mk,v 1.1 2006/08/06 06:32:02 mthuurne Exp $ -# -# RPM opt flavour: - # Opt flags. CXXFLAGS+=%{optflags} -DNDEBUG +LINK_FLAGS+=%{__global_ldflags} # Dont strip exe, let rpm do it and save debug info OPENMSX_STRIP:=false +CATAPULT_STRIP:=false +EOF + +cp build/flavour-rpm.mk %{name}-catapult-%{version}/build + +cat > build/custom.mk << EOF +INSTALL_BASE:=%{_prefix} +VERSION_EXEC:=false +SYMLINK_FOR_BINARY:=false +INSTALL_CONTRIB:=false +INSTALL_SHARE_DIR=%{_datadir}/%{name} +INSTALL_DOC_DIR=%{_docdir}/%{name} +EOF + +cat > %{name}-catapult-%{version}/build/custom.mk << EOF +# If we set this to %{_prefix} catapult cannot find its resources +INSTALL_BASE:=%{_datadir}/%{name}-catapult +SYMLINK_FOR_BINARY:=false +INSTALL_BINARY_DIR=%{_bindir} +INSTALL_SHARE_DIR=%{_datadir}/%{name}-catapult +INSTALL_DOC_DIR=%{_docdir}/%{name}-catapult +CATAPULT_OPENMSX_BINARY:=%{_bindir}/%{name} +CATAPULT_OPENMSX_SHARE:=%{_datadir}/%{name} EOF %build %configure -make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\ - INSTALL_DOC_DIR=%{_docdir}/%{name} +make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm V=1 +pushd %{name}-catapult-%{version} + make %{?_smp_mflags} CATAPULT_FLAVOUR=rpm V=1 +popd # Build desktop icon cat >%{name}.desktop <%{name}.desktop </dev/null || : -%postun +%postun catapult if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%posttrans +%posttrans catapult gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -167,15 +205,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %license doc/GPL.txt %{_bindir}/%{name} %{_datadir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1.gz %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/settings.xml +%files catapult +%doc %{_docdir}/%{name}-catapult +%license doc/GPL.txt +%{_bindir}/%{name}-catapult +%{_datadir}/%{name}-catapult +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png + %changelog +* Thu Aug 11 2016 Hans de Goede - 0.13.0-1 +- New upstream release 0.13.0 (rhbz#1353901) +- Include catapult graphical frontend (in a new -catapult subpackage) +- Move .desktop file to the -catapult subpackage and make it launch Catapult + * Sun Feb 21 2016 Hans de Goede - 0.12.0-1 - New upstream release 0.12.0 (rhbz#1306725) - Fix FTBFS (rhbz#1307827) diff --git a/sources b/sources index c234374..a13ed92 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -a167b0923a354b5826b51751811ae580 openmsx-0.12.0.tar.gz +995ad158a3796bf576d6ce7722c87d82 openmsx-0.13.0.tar.gz +87b393b5ca710eb4c84fc27e082759ae openmsx-catapult-0.13.0.tar.gz