rpms/wastesedge/F-10 wastesedge.spec,1.2,1.3

[Mathieu Bridon]

Author: bochecha

Update of /cvs/pkgs/rpms/wastesedge/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31072

Modified Files:
	wastesedge.spec 
Log Message:
Fixed RHBZ#477481 and added missing Requires: on hicolor-icon-theme




Index: wastesedge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wastesedge/F-10/wastesedge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wastesedge.spec	28 Jun 2008 18:22:27 -0000	1.2
+++ wastesedge.spec	13 Feb 2009 22:50:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           wastesedge
 Version:        0.3.4
-Release:        0.9%{?dist}
+Release:        0.11%{?dist}
 Summary:        Official game package for Adonthell
 
 Group:          Amusements/Games
@@ -8,7 +8,7 @@
 URL:            http://adonthell.linuxgames.com/
 Source0:        http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz
 Source1:        %{name}.desktop
-Patch0:        %{name}-more.patch
+Patch0:         %{name}-more.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -16,6 +16,7 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 Requires:       adonthell >= %{version}-%{release}
+Requires:       hicolor-icon-theme
 
 
 %description
@@ -34,6 +35,10 @@
 sed -i 's|datadir = @gamedatadir@|datadir = ${prefix}/share|' po/Makefile.in.in
 # patch configure to not use "more" any more
 %patch0 -p0
+# remove ttf font while its license is unknown
+rm gfx/window/font/avatar.ttf
+sed -i 's|avatar.ttf||g' gfx/window/font/Makefile.in
+
 
 %build
 %configure
@@ -43,9 +48,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+# install images in the correct folders
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32}/apps
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_16x16.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_32x32.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+
+# install desktop file not provided upstream
 desktop-file-install --vendor=""                      \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
         %{SOURCE1}
@@ -81,6 +90,10 @@
 
 
 %changelog
+* Fri Feb 13 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.4-0.11
+- added missing Requires: on hicolor-icon-theme
+- deleted the unproperly licensed font - RHBZ#4774
+
 * Sat Jun 28 2008 Mathieu Bridon <bochecha at no-log.org> 0.3.4-0.9
 - patched configure script so that it doesn't use "more" any more.