commit 677845ef173906e99eac7b8dd23843867a27157f
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Mon Jun 15 12:53:35 2020 +0200
Updated to new upstream release
.gitignore | 1 +
sources | 4 ++--
xroar-0.35.4-fcommon-fix.patch | 24 ------------------------
xroar.spec | 24 +++++++++++++-----------
4 files changed, 16 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c259e3..8630602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ dragon.rom
/xroar-0.35.2.tar.gz
/xroar-0.35.3.tar.gz
/xroar-0.35.4.tar.gz
+/xroar-0.36.tar.gz
diff --git a/sources b/sources
index a5f204a..f3cfcb3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
-072fb6c260840ff6e6f12083a4907939 xroar-0.35.4.tar.gz
+SHA512 (xroar-0.36.tar.gz) =
e5c13174deaf3637607b8b35759ec559b5e05956edcd6cc61eb1d4b42561e5b2b87b30d461270aa08cda3e4ae37e4eb1174f8e64aede4d6271e1d419e9c09f13
+SHA512 (dragon.rom) =
bbe3dc286a828acd745155ad8b2f8f1dc7d674c10deae619758662a4f45feefd1d1aea6b8b09f4c4db8b40cbaf475ab540d88d8286e1e4f8478692ad08979285
diff --git a/xroar.spec b/xroar.spec
index 6ff17de..5501007 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,15 +1,14 @@
Name: xroar
-Version: 0.35.4
-Release: 4%{?dist}
+Version: 0.36
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
-License: GPLv2+
+License: GPLv3+
URL:
http://www.6809.org.uk/xroar/
Source0:
http://www.6809.org.uk/xroar/download/%{name}-%{version}.tar.gz
Source1:
http://www.6809.org.uk/dragon/dragon.rom
Source2: %{name}.desktop
Source3: %{name}-minifirm.desktop
Source4: %{name}.appdata.xml
-Patch1: xroar-0.35.4-fcommon-fix.patch
BuildRequires: gcc
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -35,7 +34,7 @@ minimal firmware is included.
%prep
-%autosetup -p1
+%autosetup
%build
@@ -74,9 +73,9 @@ desktop-file-install \
%{SOURCE3}
# Install AppData file
-install -d -m 755 %{buildroot}%{_datadir}/metainfo
-install -p -m 644 %{SOURCE4} %{buildroot}%{_datadir}/metainfo
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+install -d -m 755 %{buildroot}%{_metainfodir}
+install -p -m 644 %{SOURCE4} %{buildroot}%{_metainfodir}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
rm -f %{buildroot}%{_infodir}/dir
@@ -87,16 +86,19 @@ rm -f %{buildroot}%{_infodir}/dir
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-minifirm.desktop
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_metainfodir}/%{name}.appdata.xml
%{_infodir}/%{name}*
%{_mandir}/man1/%{name}.1*
-%license COPYING.GPL COPYING.LGPL-2.1
-%doc ChangeLog README
+%license COPYING.GPL COPYING.LGPL
+%doc ChangeLog README README.SDS
%doc doc/%{name}.html doc/%{name}-screens.png doc/%{name}-timebandit-af.png
%doc doc/%{name}.pdf
%changelog
+* Sat Jun 13 2020 Andrea Musuruane <musuruan(a)gmail.com> - 0.36-1
+- Updated to new upstream release
+
* Tue Mar 17 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.35.4-4
- Fix FTBFS