rpms/scorched3d/FC-4 scorched3d-syslibs.patch, 1.1, 1.2 scorched3d.spec, 1.5, 1.6

Tue Feb 14 22:01:55 UTC 2006

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30670

Modified Files:
	scorched3d-syslibs.patch scorched3d.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> - 39.1-4
- Bump release and rebuild for new gcc4.1 and glibc.

* Sun Feb 12 2006 <j.w.r.degoede at hhs.nl> - 39.1-3
- fix server crashing with certain landscape types (patch 13)

* Sat Feb 11 2006 <j.w.r.degoede at hhs.nl> - 39.1-2
- upgrade to CVS snapshot of 20050929, as Debian does, but not to
  the newer apoc version as this causes problems playing online (patch 0)
- fix gcc41 compilation (patch 3)
- fix 64 bit compilation (bz 158646) (patch 4)
- fix compile with openal-0.9 (patch 5)
- use htmlview for helpfile viewing instead of hardcoded mozilla,
  run this in background so the game doesn't freeze (patch 6)
- fix all the security issues reported on the fulldisclosure mailinglist:
  http://seclists.org/lists/fulldisclosure/2005/Nov/0079.html
  (bz 161694) (patch 7, 8, 9, 10)
- fix 2 additonal security issues found while fixing the above (patch 11, 12)
- this release also fixes bz 161694

* Sat Oct  8 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 39.1-1
- 39.1.
- Avoid aclocal >= 1.8 warnings.
- Install icon into icons/hicolor.
- Clean up build dependencies.


scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-4/scorched3d-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- scorched3d-syslibs.patch	8 Nov 2004 05:20:12 -0000	1.1
+++ scorched3d-syslibs.patch	14 Feb 2006 22:01:54 -0000	1.2
@@ -1,31 +1,28 @@
-diff -Nru scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
---- scorched.orig/src/coms/NetServerProtocol.cpp	2003-12-06 19:45:22.000000000 +0200
-+++ scorched/src/coms/NetServerProtocol.cpp	2004-08-16 01:15:42.278969732 +0300
-@@ -22,7 +22,7 @@
- #include <coms/NetMessagePool.h>
- #include <coms/NetInterface.h>
- #include <common/Logger.h>
+--- scorched/src/engine/ModFileEntry.cpp~	2005-06-06 00:54:01.000000000 +0300
++++ scorched/src/engine/ModFileEntry.cpp	2005-10-08 02:14:29.000000000 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include <engine/ModFileEntry.h>
+ #include <engine/ModFiles.h>
 -#include <zlib/zlib.h>
 +#include <zlib.h>
+ #include <wx/dir.h>
+ #include <wx/utils.h>
  
- NetServerProtocol::NetServerProtocol()
- {
-diff -Nru scorched.orig/src/landscape/LandscapeMaps.cpp scorched/src/landscape/LandscapeMaps.cpp
---- scorched.orig/src/landscape/LandscapeMaps.cpp	2004-02-27 00:00:26.000000000 +0200
-+++ scorched/src/landscape/LandscapeMaps.cpp	2004-08-16 01:16:04.026241398 +0300
-@@ -25,7 +25,7 @@
+--- scorched/src/landscape/LandscapeMaps.cpp~	2005-08-10 15:39:31.000000000 +0300
++++ scorched/src/landscape/LandscapeMaps.cpp	2005-10-08 02:14:45.000000000 +0300
+@@ -31,7 +31,7 @@
  #include <common/RandomGenerator.h>
  #include <common/Defines.h>
  #include <common/Logger.h>
 -#include <zlib/zlib.h>
 +#include <zlib.h>
+ #include <float.h>
  #include <stdlib.h>
  
- LandscapeMaps::LandscapeMaps() : 
-diff -Nru scorched.orig/src/scorched/Makefile.am scorched/src/scorched/Makefile.am
---- scorched.orig/src/scorched/Makefile.am	2004-05-20 19:41:53.000000000 +0300
-+++ scorched/src/scorched/Makefile.am	2004-08-16 01:14:56.963984303 +0300
-@@ -608,39 +608,6 @@
+--- scorched/src/scorched/Makefile.am~	2005-08-30 21:04:22.000000000 +0300
++++ scorched/src/scorched/Makefile.am	2005-10-08 02:15:02.000000000 +0300
+@@ -690,39 +690,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -64,10 +61,42 @@
 -	../zlib/zutil.h \
  	../actions/ActionVector.cpp \
  	../actions/ActionVector.h \
- 	../actions/CameraPositionAction.cpp \
-diff -Nru scorched.orig/src/XML/XMLParser.h scorched/src/XML/XMLParser.h
---- scorched.orig/src/XML/XMLParser.h	2004-05-14 00:50:20.000000000 +0300
-+++ scorched/src/XML/XMLParser.h	2004-08-16 01:15:18.494326511 +0300
+ 	../actions/Animation.cpp \
+--- scorched/src/coms/NetServerProtocol.cpp~	2005-06-13 20:31:06.000000000 +0300
++++ scorched/src/coms/NetServerProtocol.cpp	2005-10-08 02:14:04.000000000 +0300
+@@ -22,7 +22,7 @@
+ #include <coms/NetMessagePool.h>
+ #include <coms/NetServer.h>
+ #include <common/Logger.h>
+-#include <zlib/zlib.h>
++#include <zlib.h>
+ 
+ NetServerProtocol::NetServerProtocol()
+ {
+--- scorched/src/coms/ComsMessageSender.cpp~	2005-07-20 00:45:36.000000000 +0300
++++ scorched/src/coms/ComsMessageSender.cpp	2005-10-08 02:13:38.000000000 +0300
+@@ -27,7 +27,7 @@
+ #include <tank/TankContainer.h>
+ #include <client/ScorchedClient.h>
+ #include <server/ScorchedServer.h>
+-#include <zlib/zlib.h>
++#include <zlib.h>
+ #include <set>
+ 
+ bool ComsMessageSender::sendToServer(ComsMessage &message)
+--- scorched/src/tank/TankAvatar.cpp~	2005-03-22 19:45:49.000000000 +0200
++++ scorched/src/tank/TankAvatar.cpp	2005-10-08 02:15:15.000000000 +0300
+@@ -22,7 +22,7 @@
+ #include <GLEXT/GLTexture.h>
+ #include <GLEXT/GLGif.h>
+ #include <common/Defines.h>
+-#include <zlib/zlib.h>
++#include <zlib.h>
+ #include <stdio.h>
+ 
+ GLTexture *TankAvatar::defaultTexture_ = 0;
+--- scorched/src/XML/XMLParser.h~	2005-06-11 19:53:41.000000000 +0300
++++ scorched/src/XML/XMLParser.h	2005-10-08 02:15:26.000000000 +0300
 @@ -23,7 +23,7 @@
  
  #include <string>


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-4/scorched3d.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scorched3d.spec	22 May 2005 22:50:37 -0000	1.5
+++ scorched3d.spec	14 Feb 2006 22:01:54 -0000	1.6
@@ -1,22 +1,39 @@
 Name:           scorched3d
-Version:        37.2
-Release: 3
-
+Version:        39.1
+Release:        4%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.scorched3d.co.uk/
-# http://dl.sf.net/scorched3d/Scorched3D-37.2-src.tar.gz bzip2'd to save 3.5MB
-Source0:        Scorched3D-37.2-src.tar.bz2
+Source0:        http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Source2:        http://dl.sf.net/scorched3d/Scorched3D-37.2-datafix.zip
-Patch0:         %{name}-syslibs.patch
+Patch0:         %{name}-cvs-20050929.patch
+Patch1:         %{name}-syslibs.patch
+Patch2:         %{name}-aclocal18.patch
+Patch3:         %{name}-gcc41.patch
+Patch4:         %{name}-64bit.patch
+Patch5:         %{name}-openal.patch
+Patch6:         %{name}-help.patch
+Patch7:         %{name}-sprintf.patch
+Patch8:         %{name}-formatstring.patch
+Patch9:         %{name}-strxxx.patch
+Patch10:        %{name}-negint.patch
+Patch11:        %{name}-XML-injection.patch
+Patch12:        %{name}-HTML-injection.patch
+Patch13:        %{name}-opengl-without-context.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel, wxGTK2-devel, SDL_mixer-devel, SDL_net-devel
-BuildRequires:  ImageMagick, %{_libdir}/libGLU.so.1, desktop-file-utils
-BuildRequires:  expat-devel, autoconf, automake
+BuildRequires:  wxGTK2-devel
+BuildRequires:  openal-devel
+BuildRequires:  freealut-devel
+BuildRequires:  SDL_net-devel
+BuildRequires:  ImageMagick
+BuildRequires:  libGLU-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  expat-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -37,13 +54,24 @@
 
 %prep
 %setup -q -n scorched
-%{__unzip} -qqoa -d data %{SOURCE2}
-# Use system zlib and expat
+find . -type d -name CVS | xargs rm -r
+rm -r autom4te.cache `find . -name Makefile`
+rm -r src/zlib `find src/XML ! -name "X*"`
 %patch0 -p1
-rm -rf src/zlib `find src/XML ! -name "X*"`
-# Get a clean start
-rm -rf autom4te.cache `find . -name Makefile`
-grep -v configure autogen.sh | sh -x -
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+. autogen.sh
 
 
 %build
@@ -58,35 +86,70 @@
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode 644 \
   --add-category X-Fedora \
   %{SOURCE1}
-install -Dpm 644 tank2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/scorched3d.png
-# The default doc dir gets removed later in the %%doc scriptlet...
-cp -pR $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version} __docs
+install -Dpm 644 tank2.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
+
+mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO __docs/documentation/
+%doc AUTHORS COPYING TODO __docs/*
 %{_bindir}/scorched3d
 %{_datadir}/games/scorched3d/
 %{_datadir}/applications/*scorched3d.desktop
-%{_datadir}/pixmaps/scorched3d.png
+%{_datadir}/icons/hicolor/*/apps/scorched3d.png
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> - 39.1-4
+- Bump release and rebuild for new gcc4.1 and glibc.
+
+* Sun Feb 12 2006 <j.w.r.degoede at hhs.nl> - 39.1-3
+- fix server crashing with certain landscape types (patch 13)
+
+* Sat Feb 11 2006 <j.w.r.degoede at hhs.nl> - 39.1-2
+- upgrade to CVS snapshot of 20050929, as Debian does, but not to
+  the newer apoc version as this causes problems playing online (patch 0)
+- fix gcc41 compilation (patch 3)
+- fix 64 bit compilation (bz 158646) (patch 4)
+- fix compile with openal-0.9 (patch 5)
+- use htmlview for helpfile viewing instead of hardcoded mozilla,
+  run this in background so the game doesn't freeze (patch 6)
+- fix all the security issues reported on the fulldisclosure mailinglist:
+  http://seclists.org/lists/fulldisclosure/2005/Nov/0079.html
+  (bz 161694) (patch 7, 8, 9, 10)
+- fix 2 additonal security issues found while fixing the above (patch 11, 12)
+- this release also fixes bz 161694
+
+* Sat Oct  8 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 39.1-1
+- 39.1.
+- Avoid aclocal >= 1.8 warnings.
+- Install icon into icons/hicolor.
+- Clean up build dependencies.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 37.2-3
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 37.2-2
 - rebuilt
 
 * Mon Aug 16 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:37.2-0.fdr.1


