rpms/scorched3d/devel .cvsignore, 1.7, 1.8 scorched3d.spec, 1.28, 1.29 sources, 1.7, 1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22782

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Wed Jan 16 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 41.2-1
- New upstream release 41.2
- No longer uses ode so stop BuildRequiring and linking to it



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2007 21:31:37 -0000	1.7
+++ .cvsignore	16 Jan 2008 22:29:13 -0000	1.8
@@ -1 +1 @@
-Scorched3D-41.1-src.tar.gz
+Scorched3D-41.2-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- scorched3d.spec	11 Jan 2008 21:28:34 -0000	1.28
+++ scorched3d.spec	16 Jan 2008 22:29:13 -0000	1.29
@@ -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 @@
 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 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 @@
 %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 @@
 
 
 %changelog
+* Wed Jan 16 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 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 <j.w.r.degoede at hhs.nl> 41.1-2
 - Fix compilation with gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2007 21:31:37 -0000	1.7
+++ sources	16 Jan 2008 22:29:13 -0000	1.8
@@ -1 +1 @@
-5fc57f040f932985b3cdaab4461b9076  Scorched3D-41.1-src.tar.gz
+6454341e360906c74469086987896039  Scorched3D-41.2-src.tar.gz