diff --git a/.cvsignore b/.cvsignore index 69268a4..6830569 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Scorched3D-41.1-src.tar.gz +Scorched3D-41.2-src.tar.gz diff --git a/scorched3d.spec b/scorched3d.spec index 153bed3..eb8a6c4 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,6 +1,6 @@ Name: scorched3d -Version: 41.1 -Release: 2%{?dist} +Version: 41.2 +Release: 1%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPLv2+ @@ -14,11 +14,9 @@ Source0: Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop Patch1: %{name}-syslibs.patch Patch2: %{name}-help.patch -# From upstream CVS -Patch3: %{name}-41.1-64bit.patch -Patch4: %{name}-41.1-gcc43.patch +Patch3: %{name}-41.1-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel +BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel BuildRequires: ImageMagick desktop-file-utils Requires: hicolor-icon-theme opengl-games-utils @@ -46,8 +44,7 @@ rm `find . -name Makefile` rm `find src/XML ! -name "X*"` %patch1 -p1 -z .syslibs %patch2 -p1 -z .help -%patch3 -p1 -z .64bit -%patch4 -p1 -z .gcc43 +%patch3 -p1 -z .gcc43 iconv -f ISO-8859-1 -t UTF8 AUTHORS > AUTHORS.tmp mv AUTHORS.tmp AUTHORS # make rpmlint happy with debuginfo package @@ -61,16 +58,15 @@ touch `find -name Makefile.in` %build %configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \ --with-docdir=%{_docdir}/%{name}-%{version} -# LDFLAGS=-lode for use of system ode -make %{?_smp_mflags} LDFLAGS=-lode +make %{?_smp_mflags} convert data/windows/tank2.ico %{name}.png %install -rm -rf $RPM_BUILD_ROOT __docs +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper -mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html . +rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -109,6 +105,10 @@ fi %changelog +* Wed Jan 16 2008 Hans de Goede 41.2-1 +- New upstream release 41.2 +- No longer uses ode so stop BuildRequiring and linking to it + * Fri Jan 11 2008 Hans de Goede 41.1-2 - Fix compilation with gcc 4.3 diff --git a/sources b/sources index 702afba..2b657ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fc57f040f932985b3cdaab4461b9076 Scorched3D-41.1-src.tar.gz +6454341e360906c74469086987896039 Scorched3D-41.2-src.tar.gz