musuruan pushed to fbzx (f22). "Updated to new upstream release (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 4 16:58:12 UTC 2015
>From c42c5a431a0a02887da11598fc809122fa429e1c Mon Sep 17 00:00:00 2001
From: Andrea Musuruane <musuruan at gmail.com>
Date: Sat, 4 Apr 2015 18:49:19 +0200
Subject: Updated to new upstream release Appdata file is now provided by
upstream Dropped obsolete Group, Buildroot, %clean and %defattr Dropped
cleaning at the beginning of %install
diff --git a/.gitignore b/.gitignore
index e6b77f8..f049d39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ fbzx-2.4.1-noroms.tar.bz2
/fbzx-2.7.0-noroms.tar.bz2
/fbzx-2.9.0-noroms.tar.bz2
/fbzx-2.10.0-noroms.tar.bz2
+/fbzx-2.11.1-noroms.tar.gz
diff --git a/fbzx-generate-tarball.sh b/fbzx-generate-tarball.sh
old mode 100644
new mode 100755
index b8d6e01..2a15979
--- a/fbzx-generate-tarball.sh
+++ b/fbzx-generate-tarball.sh
@@ -5,9 +5,9 @@ VERSION=$1
mkdir $NAME
cd $NAME
-tar xvfj ../$NAME-$VERSION.tar.bz2
+tar xvfz ../$NAME-$VERSION.tar.gz
rm -rf $NAME-$VERSION/spectrum-roms/
-tar cvfj ../$NAME-$VERSION-noroms.tar.bz2 .
+tar cvfz ../$NAME-$VERSION-noroms.tar.gz $NAME-$VERSION
cd ..
rm -rf $NAME
diff --git a/fbzx.spec b/fbzx.spec
index bb1b351..b39d3d3 100644
--- a/fbzx.spec
+++ b/fbzx.spec
@@ -1,26 +1,25 @@
Name: fbzx
-Version: 2.10.0
-Release: 6%{?dist}
+Version: 2.11.1
+Release: 1%{?dist}
Summary: A ZX Spectrum emulator for FrameBuffer
-Group: Applications/Emulators
License: GPLv3+
URL: http://www.rastersoft.com/fbzx.html
-Source0: %{name}-%{version}-noroms.tar.bz2
+Source0: %{name}-%{version}-noroms.tar.gz
# The above file is derived from:
-# http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
+# https://github.com/rastersoft/fbzx/archive/%{version}/%{name}-%{version}.tar.gz
# This file contains Spectrum ROMs and cannot be shipped in Fedora.
# Therefore we use this script to remove them before shipping it.
# Download the upstream tarball and invoke this script while in
# the tarball's directory:
-# ./fbzx-generate-tarball.sh 2.10.0
+# ./fbzx-generate-tarball.sh 2.11.1
Source1: %{name}-generate-tarball.sh
Source2: README_%{name}.Fedora
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
+BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -42,9 +41,7 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
-#install application
+# install application
mkdir -p %{buildroot}%{_bindir}
install -m 755 %{name} %{buildroot}%{_bindir}
@@ -67,42 +64,10 @@ desktop-file-install \
# install Fedora README
install -pm0644 %{SOURCE2} README.Fedora
-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch at redhat.com> -->
-<!--
-EmailAddress: raster at rastersoft.com
-SentUpstream: 2014-09-24
--->
-<application>
- <id type="desktop">fbzx.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <summary> a Sinclair Spectrum emulator</summary>
- <description>
- <p>
- FBZX is a Sinclair Spectrum emulator that accurately emulates the screen,
- sound and keyboard of many Spectrum devices including Issue 2 and Issue 3
- of the original Spectrum, the classic and the Spanish 128K versions,
- and the Amstrad Plus 2 and 2A.
- </p>
- </description>
- <url type="homepage">http://www.rastersoft.com/fbzx.html</url>
- <screenshots>
- <screenshot type="default">http://www.rastersoft.com/imagen/fbzx.png</screenshot>
- </screenshots>
-</application>
-EOF
-
-%clean
-rm -rf %{buildroot}
+# install AppData file
+mkdir -p %{buildroot}%{_datadir}/appdata
+install -p -m 644 fbzx.appdata.xml %{buildroot}%{_datadir}/appdata
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
%post
@@ -121,7 +86,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
@@ -131,6 +95,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sat Apr 04 2015 Andrea Musuruane <musuruan at gmail.com> - 2.11.1-1
+- Updated to new upstream release
+- Appdata file is now provided by upstream
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Dropped cleaning at the beginning of %%install
+
* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 2.10.0-6
- Add an AppData file for the software center
diff --git a/sources b/sources
index a5c8d23..788dee2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66189a748c853aa5a04a624ccd14e0fc fbzx-2.10.0-noroms.tar.bz2
+d79636b66260898b7b0a88007705e9ad fbzx-2.11.1-noroms.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/fbzx.git/commit/?h=f22&id=c42c5a431a0a02887da11598fc809122fa429e1c
More information about the scm-commits
mailing list