diff --git a/.gitignore b/.gitignore index 233a161..5b6a365 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -abe-1.1.tar.gz +/abe-1.1.tar.gz +/abe-icons.tar.xz diff --git a/abe.spec b/abe.spec index dea59e0..3e19d3a 100644 --- a/abe.spec +++ b/abe.spec @@ -1,13 +1,13 @@ Name: abe Version: 1.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL+ URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz -Source1: %{name}.png +Source1: %{name}-icons.tar.xz Source2: %{name}.appdata.xml # Enable changing the video settings. Sent upstream 2 Apr 2006: # https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743 @@ -28,6 +28,10 @@ BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 BuildRequires: libXmu-devel libXi-devel BuildRequires: desktop-file-utils +Requires: hicolor-icon-theme + +%global icondir %{_datadir}/icons/hicolor + %description A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in the style of similar games for the Commodore+4. @@ -57,9 +61,9 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +mkdir -p $RPM_BUILD_ROOT/%{icondir} cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ +tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{icondir} install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/ cat << EOF > %{name}.desktop @@ -76,12 +80,14 @@ EOF desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop %post -update-desktop-database %{_datadir}/applications &>/dev/null +update-desktop-database %{_datadir}/applications &>/dev/null || : +touch --no-create %{icondir} >&/dev/null ||: +gtk-update-icon-cache %{icondir} >&/dev/null ||: %postun -if [ $1 -eq 0 ]; then - update-desktop-database %{_datadir}/applications &>/dev/null -fi +update-desktop-database %{_datadir}/applications &>/dev/null +touch --no-create %{icondir} >&/dev/null ||: +gtk-update-icon-cache %{icondir} >&/dev/null ||: %files %doc COPYING README @@ -89,9 +95,12 @@ fi %{_datadir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Mon Jul 21 2014 Jerry James - 1.1-23 +- Add icons of varying sizes + * Fri Jun 06 2014 Fedora Release Engineering - 1.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 41b001f..9c013ca 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz +e41f81ca337cbfd7251d252232347f6b abe-icons.tar.xz