diff options
| author | B Stack <bgstack15@gmail.com> | 2019-04-06 00:52:39 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-04-06 00:52:39 +0000 |
| commit | 37ce2e21db7c7282a69c261c5969e6c78819d9bd (patch) | |
| tree | 7e3f85bef1df908581415ad473bf3e4b8eaba832 /beyond-the-titanic | |
| parent | beyond-the-titanic: fix minor spec problems (diff) | |
| parent | 7w dpkg (diff) | |
| download | stackrpms-37ce2e21db7c7282a69c261c5969e6c78819d9bd.tar.gz stackrpms-37ce2e21db7c7282a69c261c5969e6c78819d9bd.tar.bz2 stackrpms-37ce2e21db7c7282a69c261c5969e6c78819d9bd.zip | |
Merge branch '7w-bump' into 'master'
add 7w game
See merge request bgstack15/stackrpms!51
Diffstat (limited to 'beyond-the-titanic')
| -rw-r--r-- | beyond-the-titanic/beyond-the-titanic.spec | 17 | ||||
| -rwxr-xr-x | beyond-the-titanic/debian/rules | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/beyond-the-titanic/beyond-the-titanic.spec b/beyond-the-titanic/beyond-the-titanic.spec index b6f0434..2e62056 100644 --- a/beyond-the-titanic/beyond-the-titanic.spec +++ b/beyond-the-titanic/beyond-the-titanic.spec @@ -1,5 +1,5 @@ -%global use_git 1 -%if 0%{use_git} +%global use_master 1 +%if 0%{use_master} %global vername master %else %global vername %{version} @@ -21,7 +21,8 @@ Source0: %{URL}/-/archive/%{vername}/%{name}-%{vername}.tar.gz Packager: B Stack <bgstack15@gmail.com> BuildRequires: fpc BuildRequires: ImageMagick -Requires: hicolor-icon-theme +# do not require the icon theme. the rpm can make the dirs, and it won't hurt on terminal-only systems to have the directories with just these icons. +#Requires: hicolor-icon-theme %description Beyond the Titanic is a 1988 text adventure game published by Apogee. @@ -53,7 +54,6 @@ cd %{name}-* # none # icons - for res in 16 22 24 32 48 64 96 128 256 ;do dir=%{buildroot}%{_datadir}/icons/hicolor/${res}x${res}/apps mkdir -p ${dir} @@ -62,6 +62,9 @@ for res in 16 22 24 32 48 64 96 128 256 ;do ${dir}/${icon}.png done done +scalable_dir="%{buildroot}%{_datadir}/icons/hicolor/scalable/apps" +install -d "${scalable_dir}" +install -m0644 ship.svg "${scalable_dir}" %clean %{__rm} -rf %{buildroot} || : @@ -74,7 +77,7 @@ update-desktop-database &> /dev/null || : # is it a final removal? #if test "$1" = "0" ; #then -#fi +#fi %postun update-desktop-database &> /dev/null || : @@ -89,11 +92,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc %attr(444, -, -) %{_docdir}/*/* %{_bindir}/%{name} %{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor/*x*/apps/*.png +%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/%{name} %changelog -* Thu Apr 4 2019 B Stack <bgstack15@gmail.com> - 0.0.1-2 +* Fri Apr 5 2019 B Stack <bgstack15@gmail.com> - 0.0.1-2 - add build dependencies - fix docdir for el diff --git a/beyond-the-titanic/debian/rules b/beyond-the-titanic/debian/rules index 5721110..1818b60 100755 --- a/beyond-the-titanic/debian/rules +++ b/beyond-the-titanic/debian/rules @@ -12,9 +12,8 @@ export _datadir="/usr/share" export _bindir="/usr/bin" %: - dh $@ + dh $@ -# FIXME: will need to override the autoinstall to do icon conversions. override_dh_auto_install: dh_auto_install -- prefix=/usr @@ -45,6 +44,8 @@ override_dh_auto_install: convert ship.svg -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${appname}.png convert ship.svg -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${appname}.png convert ship.svg -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${appname}.png + mkdir -p ${buildroot}${_datadir}/icons/hicolor/scalable/apps + install -m0644 ship.svg ${buildroot}${_datadir}/icons/hicolor/scalable/apps #override_dh_install: # dh_install --list-missing -X.pyc -X.pyo |