From 3cc5ce81369b23fe6f075050a3c69a3293f043dc Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Nov 02 2006 20:45:26 +0000 Subject: - New upstream release 40.1c - Drop 64 bit patch (integrated upstream) - Don't install our data files in /usr/share/games, but in /usr/share - Some minor specfile cleanups --- diff --git a/.cvsignore b/.cvsignore index 7dfe977..ba0088c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Scorched3D-40-src.tar.gz +Scorched3D-40.1c-src.tar.gz diff --git a/scorched3d-help.patch b/scorched3d-help.patch index bf8359b..f87f11b 100644 --- a/scorched3d-help.patch +++ b/scorched3d-help.patch @@ -1,25 +1,3 @@ -diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp ---- scorched.orig/src/scorched/HtmlHelpDialog.cpp 2006-02-17 18:48:54.000000000 +0100 -+++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-07-16 11:03:57.000000000 +0200 -@@ -137,13 +137,13 @@ - void HelpFrame::onHome(wxCommandEvent &event) - { - html_->HistoryClear(); -- html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8)); -+ html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8)); - } - - void showHtmlHelpDialog() - { - // For the moment just show the documentation in the default web browser -- showURL(formatString("file://%s", getDocFile("documentation/html/index.html"))); -+ showURL(formatString("file://%s", getDocFile("html/index.html"))); - - //HelpFrame *frame = new HelpFrame(); - //frame->Show(); -Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig -Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej -Only in scorched/src/scorched: HtmlHelpDialog.cpp~ diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp --- scorched.orig/src/scorched/MainDialog.cpp 2006-05-14 17:00:11.000000000 +0200 +++ scorched/src/scorched/MainDialog.cpp 2006-07-16 11:05:27.000000000 +0200 @@ -34,6 +12,3 @@ diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDia #endif // __DARWIN__ #endif // _WIN32 } -Only in scorched/src/scorched: MainDialog.cpp.orig -Only in scorched/src/scorched: MainDialog.cpp.rej -Only in scorched/src/scorched: MainDialog.cpp~ diff --git a/scorched3d-syslibs.patch b/scorched3d-syslibs.patch index 6022784..f2f732c 100644 --- a/scorched3d-syslibs.patch +++ b/scorched3d-syslibs.patch @@ -1,16 +1,16 @@ ---- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/NetServerProtocol.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-08-04 15:35:15.000000000 +0200 ++++ scorched/src/coms/NetServerProtocol.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include - #include + #include #include -#include +#include NetServerProtocol::NetServerProtocol() { ---- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/ComsMessageSender.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-09-08 17:07:59.000000000 +0200 ++++ scorched/src/coms/ComsMessageSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -27,7 +27,7 @@ #include #include @@ -21,7 +21,7 @@ bool ComsMessageSender::sendToServer(ComsMessage &message) --- scorched/src/XML/XMLParser.h.syslibs 2006-05-01 01:42:52.000000000 +0200 -+++ scorched/src/XML/XMLParser.h 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/XML/XMLParser.h 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #if !defined(__INCLUDE_XMLParserh_INCLUDE__) #define __INCLUDE_XMLParserh_INCLUDE__ @@ -31,18 +31,18 @@ #include class XMLParser ---- scorched/src/scorched/Makefile.am.syslibs 2006-07-15 17:14:50.000000000 +0200 -+++ scorched/src/scorched/Makefile.am 2006-07-16 11:36:47.000000000 +0200 -@@ -260,7 +260,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.am.syslibs 2006-10-27 20:48:23.000000000 +0200 ++++ scorched/src/scorched/Makefile.am 2006-10-31 20:12:35.000000000 +0100 +@@ -271,7 +271,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -602,95 +601,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -637,96 +636,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -50,6 +50,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -137,7 +138,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1100,14 +1010,6 @@ +@@ -1134,14 +1043,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -152,18 +153,18 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ ---- scorched/src/scorched/Makefile.in.syslibs 2006-07-15 17:15:28.000000000 +0200 -+++ scorched/src/scorched/Makefile.in 2006-07-16 11:37:23.000000000 +0200 -@@ -360,7 +360,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.in.syslibs 2006-10-30 19:10:42.000000000 +0100 ++++ scorched/src/scorched/Makefile.in 2006-10-31 20:19:02.000000000 +0100 +@@ -372,7 +372,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -702,95 +701,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -738,96 +737,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -171,6 +172,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -258,7 +260,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1200,14 +1110,6 @@ +@@ -1235,14 +1144,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -273,20 +275,21 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ -@@ -1426,7 +1328,7 @@ - SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \ - StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \ - StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \ +@@ -1471,7 +1372,7 @@ + SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \ + StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \ + Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \ - VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \ + VectorLib.$(OBJEXT) \ ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \ ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \ Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \ -@@ -1506,21 +1408,6 @@ - WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \ - WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ - WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \ -- array.$(OBJEXT) collision_kernel.$(OBJEXT) \ +@@ -1558,22 +1459,7 @@ + WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \ + WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ + WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \ +- WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \ +- collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \ - collision_space.$(OBJEXT) collision_std.$(OBJEXT) \ - collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \ - error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \ @@ -301,21 +304,19 @@ - infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \ - trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \ ++ WeaponVelocity.$(OBJEXT) \ AddTarget.$(OBJEXT) Animation.$(OBJEXT) \ CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \ Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \ -@@ -1625,8 +1512,8 @@ - TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \ - ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \ - XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \ -- XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \ -- xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ -+ XMLStringBuffer.$(OBJEXT) \ -+ Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ +@@ -1677,7 +1563,6 @@ + TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \ + ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \ + XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \ +- xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \ + Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \ - TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \ - TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \ -@@ -2178,35 +2065,9 @@ + TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \ +@@ -2252,36 +2137,9 @@ @AMDEP_TRUE@ ./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLStringBuffer.Po \ @@ -323,6 +324,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.lex.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.tab.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/collision_kernel.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/collision_quadtreespace.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/collision_space.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/collision_std.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/collision_transform.Po \ @@ -352,20 +354,21 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -@@ -2386,7 +2247,6 @@ - Triangle.$(OBJEXT): ../common/Triangle.cpp +@@ -2468,7 +2326,6 @@ Vector.$(OBJEXT): ../common/Vector.cpp + Vector4.$(OBJEXT): ../common/Vector4.cpp VectorLib.$(OBJEXT): ../common/VectorLib.cpp -snprintf.$(OBJEXT): ../common/snprintf.c ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp Bone.$(OBJEXT): ../3dsparse/Bone.cpp Face.$(OBJEXT): ../3dsparse/Face.cpp -@@ -2563,49 +2423,6 @@ - WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp +@@ -2658,50 +2515,6 @@ WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp + WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp -array.$(OBJEXT): ../ode/array.cpp -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp +-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp -collision_space.$(OBJEXT): ../ode/collision_space.cpp -collision_std.$(OBJEXT): ../ode/collision_std.cpp -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp @@ -410,7 +413,7 @@ AddTarget.$(OBJEXT): ../actions/AddTarget.cpp Animation.$(OBJEXT): ../actions/Animation.cpp CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp -@@ -2807,9 +2624,6 @@ +@@ -2902,9 +2715,6 @@ XMLNode.$(OBJEXT): ../XML/XMLNode.cpp XMLParser.$(OBJEXT): ../XML/XMLParser.cpp XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp @@ -420,7 +423,7 @@ Target.$(OBJEXT): ../target/Target.cpp TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp -@@ -3476,56 +3290,9 @@ +@@ -3593,57 +3403,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLNode.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLParser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLStringBuffer.Po@am__quote@ @@ -429,6 +432,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.lex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aseFile.tab.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision_kernel.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision_quadtreespace.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision_space.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision_std.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision_transform.Po@am__quote@ @@ -477,7 +481,7 @@ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -3542,269 +3309,6 @@ +@@ -3660,269 +3422,6 @@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `cygpath -w $<` @@ -747,7 +751,7 @@ CCDEPMODE = @CCDEPMODE@ .cpp.o: -@@ -7395,306 +6897,6 @@ +@@ -7717,318 +7216,6 @@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp` @@ -775,6 +779,18 @@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp` - +-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp +-@AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp +- +-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp +-@AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp` +- -collision_space.o: ../ode/collision_space.cpp -@AMDEP_TRUE@ source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@ @@ -1055,7 +1071,7 @@ @AMDEP_TRUE@ source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@ --- scorched/src/engine/ModFileEntry.cpp.syslibs 2006-04-13 00:49:26.000000000 +0200 -+++ scorched/src/engine/ModFileEntry.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/engine/ModFileEntry.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #include #include @@ -1066,7 +1082,7 @@ #include --- scorched/src/tank/TankAvatar.cpp.syslibs 2006-02-13 18:54:27.000000000 +0100 -+++ scorched/src/tank/TankAvatar.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/tank/TankAvatar.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include #include @@ -1076,8 +1092,8 @@ #include GLTexture *TankAvatar::defaultTexture_ = 0; ---- scorched/src/landscape/HeightMapSender.cpp~ 2006-07-16 11:55:01.000000000 +0200 -+++ scorched/src/landscape/HeightMapSender.cpp 2006-07-16 11:55:01.000000000 +0200 +--- scorched/src/landscape/HeightMapSender.cpp.syslibs 2005-11-25 11:35:42.000000000 +0100 ++++ scorched/src/landscape/HeightMapSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -20,7 +20,7 @@ #include diff --git a/scorched3d-wx26.patch b/scorched3d-wx26.patch index d1e6fe0..d05b23b 100644 --- a/scorched3d-wx26.patch +++ b/scorched3d-wx26.patch @@ -1,28 +1,3 @@ ---- scorched/src/scorched/NetLan.cpp~ 2006-07-16 12:50:44.000000000 +0200 -+++ scorched/src/scorched/NetLan.cpp 2006-07-16 12:50:44.000000000 +0200 -@@ -96,9 +96,9 @@ - // Radio Buttons - wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5); - IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, -- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP); -+ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, -- "LAN", wxDefaultPosition, wxDefaultSize, 0); -+ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0); - radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10); - radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0); - sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5); ---- scorched/src/scorched/OptionEntrySetter.cpp~ 2006-07-16 13:04:56.000000000 +0200 -+++ scorched/src/scorched/OptionEntrySetter.cpp 2006-07-16 13:04:56.000000000 +0200 -@@ -122,7 +122,7 @@ - { - sizer->Add(control = - new wxCheckBox(parent, -1, -- "", -+ wxT(""), - wxDefaultPosition, wxDefaultSize), - 0, wxALIGN_LEFT); - control->SetToolTip( --- scorched/src/scorched/NetLan.cpp~ 2006-07-16 20:36:19.000000000 +0200 +++ scorched/src/scorched/NetLan.cpp 2006-07-16 20:36:19.000000000 +0200 @@ -71,17 +71,11 @@ diff --git a/scorched3d.spec b/scorched3d.spec index 3d252fd..fe29d18 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -1,27 +1,20 @@ Name: scorched3d -Version: 40 -Release: 2%{?dist} +Version: 40.1c +Release: 1%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPL URL: http://www.scorched3d.co.uk/ -Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz +Source0: http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop Patch1: %{name}-syslibs.patch Patch2: %{name}-wx26.patch -Patch4: %{name}-64bit.patch -Patch5: %{name}-openal.patch -Patch6: %{name}-help.patch +Patch3: %{name}-openal.patch +Patch4: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel -BuildRequires: openal-devel -BuildRequires: freealut-devel -BuildRequires: SDL_net-devel -BuildRequires: ImageMagick -BuildRequires: libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: expat-devel -BuildRequires: ode-devel +BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel +BuildRequires: expat-devel ImageMagick desktop-file-utils +Requires: hicolor-icon-theme # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -42,13 +35,12 @@ conditions and terrains to be dealt with. %prep %setup -q -n scorched -rm -r autom4te.cache `find . -name Makefile` +rm -r `find . -name Makefile` rm -r src/zlib src/ode `find src/XML ! -name "X*"` -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch1 -p1 -z .syslibs +%patch2 -p1 -z .wx26 +%patch3 -p1 -z .openal +%patch4 -p1 -z .help # make rpmlint happy with debuginfo package chmod -x src/GLEXT/* # stop autoxxx from running @@ -58,29 +50,27 @@ touch `find -name Makefile.in` %build -%configure \ - --disable-dependency-tracking \ - --datadir=%{_datadir}/games/%{name} \ - --with-docdir=$RPM_DOC_DIR/%{name}-%{version} +%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \ + --with-docdir=%{_docdir}/%{name}-%{version} # LDFLAGS=-lode for use of system ode make %{?_smp_mflags} LDFLAGS=-lode -convert data/windows/tank2.ico tank2.png +convert data/windows/tank2.ico %{name}.png %install rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html . -desktop-file-install \ - --vendor fedora \ +# below is the desktop file and icon stuff. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --mode 644 \ - --add-category X-Fedora \ + --add-category X-Fedora \ %{SOURCE1} -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 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +install -p -m 644 %{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean @@ -88,22 +78,34 @@ rm -rf $RPM_BUILD_ROOT %post -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %postun -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files %defattr(-,root,root,-) -%doc AUTHORS COPYING TODO __docs/* -%{_bindir}/scorched3d -%{_datadir}/games/scorched3d/ -%{_datadir}/applications/*scorched3d.desktop -%{_datadir}/icons/hicolor/*/apps/scorched3d.png +%doc AUTHORS COPYING TODO html +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog +* Tue Aug 29 2006 Hans de Goede 40.1c-1 +- New upstream release 40.1c +- Drop 64 bit patch (integrated upstream) +- Don't install our data files in /usr/share/games, but in /usr/share +- Some minor specfile cleanups + * Tue Aug 29 2006 Hans de Goede 40-2 - FE6 Rebuild diff --git a/sources b/sources index 60a88c9..256ddaa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz +a45c9446af99c943a19a4c9a7602531f Scorched3D-40.1c-src.tar.gz