rpms/scorched3d/devel scorched3d-aclocal18.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scorched3d-syslibs.patch, 1.1, 1.2 scorched3d.spec, 1.5, 1.6 sources, 1.2, 1.3
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue Oct 11 19:19:41 UTC 2005
Author: scop
Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32146
Modified Files:
.cvsignore scorched3d-syslibs.patch scorched3d.spec sources
Added Files:
scorched3d-aclocal18.patch
Log Message:
* 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-aclocal18.patch:
--- NEW FILE scorched3d-aclocal18.patch ---
--- acinclude.m4~ 2004-05-26 15:01:15.000000000 +0300
+++ acinclude.m4 2005-10-08 00:45:36.000000000 +0300
@@ -8,7 +8,7 @@
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
-AC_DEFUN(AM_PATH_SDL,
+AC_DEFUN([AM_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
@@ -220,7 +220,7 @@
dnl command line options
dnl ---------------------------------------------------------------------------
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
+AC_DEFUN([AM_OPTIONS_WXCONFIG],
[
AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)],
wx_config_prefix="$withval", wx_config_prefix="")
@@ -243,7 +243,7 @@
dnl
dnl Get the cflags and libraries from the wx-config script
dnl
-AC_DEFUN(AM_PATH_WXCONFIG,
+AC_DEFUN([AM_PATH_WXCONFIG],
[
dnl do we have wx-config name: it can be wx-config or wxd-config or ...
if test x${WX_CONFIG_NAME+set} != xset ; then
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:20:12 -0000 1.2
+++ .cvsignore 11 Oct 2005 19:19:39 -0000 1.3
@@ -1,2 +1 @@
-Scorched3D-37.2-datafix.zip
-Scorched3D-37.2-src.tar.bz2
+Scorched3D-39.1-src.tar.gz
scorched3d-syslibs.patch:
Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/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 11 Oct 2005 19:19:39 -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/devel/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 11 Oct 2005 19:19:39 -0000 1.6
@@ -1,22 +1,27 @@
Name: scorched3d
-Version: 37.2
-Release: 3
-
+Version: 39.1
+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/
-# 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
+Patch1: %{name}-aclocal18.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: SDL_mixer-devel
+BuildRequires: SDL_net-devel
+BuildRequires: ImageMagick
+BuildRequires: libGLU-devel
+BuildRequires: desktop-file-utils
+BuildRequires: expat-devel
+BuildRequires: %{_bindir}/openal-config
+BuildRequires: autoconf
+BuildRequires: automake
# Upstream naming compatibility
Provides: Scorched3D = %{version}-%{release}
@@ -37,12 +42,11 @@
%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`
+%patch1
grep -v configure autogen.sh | sh -x -
@@ -58,35 +62,50 @@
%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} __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/
%{_bindir}/scorched3d
%{_datadir}/games/scorched3d/
%{_datadir}/applications/*scorched3d.desktop
-%{_datadir}/pixmaps/scorched3d.png
+%{_datadir}/icons/hicolor/*/apps/scorched3d.png
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:20:12 -0000 1.2
+++ sources 11 Oct 2005 19:19:39 -0000 1.3
@@ -1,2 +1 @@
-7960b554ebfabf30b5fd5b366b1a4ec5 Scorched3D-37.2-datafix.zip
-f506eabb8b32921a72b2e9040061799b Scorched3D-37.2-src.tar.bz2
+b5d4600ff77e8e1ba2848ef400ae76eb Scorched3D-39.1-src.tar.gz
More information about the fedora-extras-commits
mailing list