dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-wastesedge-src-0.3.4.tar.gz

.gitignore

@@ -0,0 +1 @@
+wastesedge-src-0.3.4-modified.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wastesedge
-# $Id$
-NAME := wastesedge
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-wastesedge-0_3_4-0_8_fc9:HEAD:wastesedge-0.3.4-0.8.fc9.src.rpm:1213824754

sources

@@ -1 +1 @@
-a4beb3d2c8ae8f52a91b54966371e973  wastesedge-src-0.3.4.tar.gz
+fceb6c6f3a345e2a3dc1b0ea3998b436  wastesedge-src-0.3.4-modified.tar.gz

wastesedge.spec

@@ -1,14 +1,21 @@
 Name:           wastesedge
 Version:        0.3.4
-Release:        0.9%{?dist}
+Release:        0.12%{?dist}
 Summary:        Official game package for Adonthell
 
 Group:          Amusements/Games
 License:        GPL+
 URL:            http://adonthell.linuxgames.com/
-Source0:        http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz
+## Due to legal issues (RHBZ#477481), upstream sources need to be modified
+# Here is how are obtained the sources used in this package:
+# $ wget http://savannah.nongnu.org/download/adonthell/%{name}-src-%{version}.tar.gz
+# $ tar xzvf %{name}-src-%{version}.tar.gz
+# $ rm %{name}-%{version}/gfx/window/font/avatar.ttf
+# $ sed -i 's|avatar.ttf||g' %{name}-%{version}/gfx/window/font/Makefile.in
+# $ tar czvf %{name}-src-%{version}-modified.tar.gz %{name}-%{version}/
+Source0:        %{name}-src-%{version}-modified.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 +23,7 @@ BuildRequires:  adonthell >= %{version}
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 Requires:       adonthell >= %{version}-%{release}
+Requires:       hicolor-icon-theme
 
 
 %description
@@ -35,6 +43,7 @@ sed -i 's|datadir = @gamedatadir@|datadir = ${prefix}/share|' po/Makefile.in.in
 # patch configure to not use "more" any more
 %patch0 -p0
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -43,9 +52,13 @@ make %{?_smp_mflags}
 %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 +94,13 @@ fi
 
 
 %changelog
+* Sun Mar 01 2009 Mathieu Bridon <bochecha@fedoraproject.org> - 0.3.4-0.12
+- deleted the unproperly licensed font in SRPM too - RHBZ#477481
+
+* Fri Feb 13 2009 Mathieu Bridon <bochecha@fedoraproject.org> - 0.3.4-0.11
+- added missing Requires: on hicolor-icon-theme
+- deleted the unproperly licensed font - RHBZ#477481
+
 * Sat Jun 28 2008 Mathieu Bridon <bochecha@no-log.org> 0.3.4-0.9
 - patched configure script so that it doesn't use "more" any more.