Update desktop file and validate it during check
Update the desktop file and tidy the spec file. Add an AppData description. Preserve timestamps during install. Drop unnecessary (since redhat-rpm-config 9.1.0-42) aarch64 patch.
This commit is contained in:
David King
parent
1e5dac8835
commit
1f72ee0dce
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2014 David King <amigadave@amigadave.com> -->
|
||||
<application>
|
||||
<id type="desktop">slashem.desktop</id>
|
||||
<name>Slash'EM</name>
|
||||
<summary>Slash'EM is a single player dungeon exploration game</summary>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>NGPL</project_license>
|
||||
<description>
|
||||
<p>Slash'EM (Super Lotsa Added Stuff Hack - Extended Magic) is a
|
||||
variant of the roguelike game NetHack that offers extra features,
|
||||
monsters, levels and items.</p>
|
||||
</description>
|
||||
<url type="homepage">http://slashem.sourceforge.net/</url>
|
||||
<updatecontact>amigadave@amigadave.com</updatecontact>
|
||||
</application>
|
||||
|
|
@ -2,8 +2,7 @@
|
|||
Name=Slash'EM
|
||||
Comment=Slash'EM is a single player dungeon exploration game
|
||||
Exec=slashem
|
||||
Icon=slashem.xpm
|
||||
Icon=slashem
|
||||
Terminal=true
|
||||
Type=Application
|
||||
Encoding=UTF-8
|
||||
Categories=Application;Game;X-Fedora;
|
||||
Categories=Game;AdventureGame;RolePlaying;X-Fedora;
|
||||
|
|
|
|||
48
slashem.spec
48
slashem.spec
|
|
@ -1,27 +1,27 @@
|
|||
Name: slashem
|
||||
Version: 0.0.8
|
||||
Release: 0.16.E0F1%{?dist}
|
||||
Release: 0.17.E0F1%{?dist}
|
||||
Summary: Super Lotsa Added Stuff Hack - Extended Magic
|
||||
|
||||
Group: Amusements/Games
|
||||
License: NGPL
|
||||
URL: http://slashem.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/slashem/se008e0f1.tar.gz
|
||||
Source0: http://downloads.sourceforge.net/%{name}/se008e0f1.tar.gz
|
||||
Source1: %{name}.desktop
|
||||
Source2: %{name}.appdata.xml
|
||||
Patch0: slashem-config.patch
|
||||
# fix building with libpng 1.5
|
||||
Patch1: slashem-libpng-1.5.patch
|
||||
# update config.guess and config.sub to recognize aarch64
|
||||
Patch2: slashem-aarch64.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1037330
|
||||
Patch3: slashem-format-security.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Patch2: slashem-format-security.patch
|
||||
|
||||
BuildRequires: /usr/bin/appstream-util
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: bison, flex, desktop-file-utils
|
||||
BuildRequires: bdftopcf, libX11-devel, libXaw-devel, libXext-devel
|
||||
BuildRequires: bdftopcf, libX11-devel, libXext-devel
|
||||
BuildRequires: libXmu-devel, libXpm-devel, libXt-devel
|
||||
BuildRequires: SDL-devel libGL-devel libpng-devel zlib-devel
|
||||
BuildRequires: pkgconfig(xaw7)
|
||||
# to compress save files
|
||||
Requires: bzip2
|
||||
# for X11 core fonts
|
||||
|
|
@ -57,10 +57,9 @@ SLASH'EM is the (continuing) saga of one such variant...
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}E0F1
|
||||
%patch0 -p 1 -b .config
|
||||
%patch1 -p 1 -b .libpng
|
||||
%patch2 -p 1 -b .aarch64
|
||||
%patch3 -p 1 -b .format-security
|
||||
%patch0 -p1 -b .config
|
||||
%patch1 -p1 -b .libpng
|
||||
%patch2 -p1 -b .format-security
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(#define FILE_AREA_VAR\).*:\1 "%{fa_var}/":' \
|
||||
|
|
@ -70,7 +69,6 @@ sed -i \
|
|||
-e 's:^\(#define FILE_AREA_DOC\).*:\1 "%{fa_doc}/":' \
|
||||
include/unixconf.h
|
||||
|
||||
|
||||
for f in *.txt ; do
|
||||
iconv -f iso8859-1 -t utf-8 $f >$f.conv
|
||||
touch -r $f $f.conv
|
||||
|
|
@ -101,14 +99,15 @@ make \
|
|||
FILE_AREA_DOC=%{fa_doc} \
|
||||
SHELLDIR=%{_bindir}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot} \
|
||||
FILE_AREA_VAR=%{buildroot}%{fa_var} \
|
||||
FILE_AREA_SAVE=%{buildroot}%{fa_save} \
|
||||
FILE_AREA_SHARE=%{buildroot}%{fa_share} \
|
||||
FILE_AREA_UNSHARE=%{buildroot}%{fa_unshare} \
|
||||
FILE_AREA_DOC=%{buildroot}%{fa_doc} \
|
||||
INSTALL="install -p" \
|
||||
SHELLDIR=%{buildroot}%{_bindir} \
|
||||
CHOWN=/bin/true \
|
||||
CHGRP=/bin/true
|
||||
|
|
@ -127,21 +126,17 @@ rm %{buildroot}%{_mandir}/man6/[^s]*
|
|||
|
||||
sed -i -e 's:^!\(SlashEM.tile_file.*\):\1:' %{buildroot}%{fa_share}/SlashEM.ad
|
||||
|
||||
install -D -p -m 0644 win/X11/nh_icon.xpm %{buildroot}%{_datadir}/pixmaps/slashem.xpm
|
||||
desktop-file-install \
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
--add-category X-Fedora \
|
||||
--add-category Application \
|
||||
--add-category Game \
|
||||
%{SOURCE1}
|
||||
install -Dpm 0644 win/X11/nh_icon.xpm %{buildroot}%{_datadir}/pixmaps/slashem.xpm
|
||||
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
|
||||
install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
%check
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc history.txt doc/*.txt README.34 readme.* slamfaq.txt dat/license dat/history
|
||||
%{_bindir}/slashem
|
||||
%{_bindir}/slashem-recover
|
||||
|
|
@ -149,6 +144,7 @@ rm -rf %{buildroot}
|
|||
%dir %{fa_unshare}
|
||||
%{fa_unshare}/nhushare
|
||||
%{_mandir}/man6/*
|
||||
%{_datadir}/appdata/%{name}.appdata.xml
|
||||
%{_datadir}/applications/slashem.desktop
|
||||
%{_datadir}/pixmaps/slashem.xpm
|
||||
%defattr(0664,root,games)
|
||||
|
|
@ -161,6 +157,12 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 20 2014 David King <amigadave@amigadave.com> - 0.0.8-0.17.E0F1
|
||||
- Update desktop file and validate it during check
|
||||
- Add AppData description and validate it during check
|
||||
- Preserve timestamps during install
|
||||
- Tidy spec file
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-0.16.E0F1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue