rpms/netpanzer/F-12 netpanzer-0.8.3-scons-fixes.patch, NONE, 1.1 netpanzer.spec, 1.14, 1.15 sources, 1.5, 1.6
Jon Ciesla
limb at fedoraproject.org
Tue Jun 1 19:51:18 UTC 2010
Author: limb
Update of /cvs/pkgs/rpms/netpanzer/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18792/F-12
Modified Files:
netpanzer.spec sources
Added Files:
netpanzer-0.8.3-scons-fixes.patch
Log Message:
Scons, sound and version fixes.
netpanzer-0.8.3-scons-fixes.patch:
SConstruct | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE netpanzer-0.8.3-scons-fixes.patch ---
--- SConstruct (revision 1218)
+++ SConstruct (working copy)
@@ -205,9 +205,9 @@
# Configure Environments
################################################################
-env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] )
-crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] )
-crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] )
+env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] )
+crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] )
+crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] )
# for this platform
if thisplatform == 'darwin':
@@ -265,12 +265,12 @@
MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp')
# BUILDS LUA
-luaenv.Append( CPPPATH = [ 'src/Lib/lua', 'src/Lib/toluapp'] )
-crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua', 'src/Lib/toluapp'] )
-crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua', 'src/Lib/toluapp'] )
-MakeStaticLib( luaenv, 'nplua', 'lua toluapp', '*.c')
-MakeStaticLib(crossmingwluaenv, 'nplua', 'lua toluapp', '*.c')
-MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua toluapp', '*.c')
+luaenv.Append( CPPPATH = [ 'src/Lib/lua' ] )
+crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua' ] )
+crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua' ] )
+MakeStaticLib( luaenv, 'nplua', 'lua', '*.c')
+MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c')
+MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c')
# BUILDS PHYSFS
physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
@@ -288,13 +288,13 @@
# BUILDS 2D
env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
env.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
-MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*')
+MakeStaticLib(env, 'np2d', '2D', '*.c*')
crossmingwenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
crossmingwenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
-MakeStaticLib(crossmingwenv, 'np2d', '2D 2D/libpng', '*.c*')
+MakeStaticLib(crossmingwenv, 'np2d', '2D', '*.c*')
crosslinuxenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
crosslinuxenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
-MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*')
+MakeStaticLib(crosslinuxenv, 'np2d', '2D', '*.c*')
# BUILDS REST OF LIBRARIES
MakeStaticLib(env, 'nplibs', 'ArrayUtil INIParser Types Util optionmm','*.cpp')
Index: netpanzer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/F-12/netpanzer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- netpanzer.spec 2 Apr 2010 14:40:32 -0000 1.14
+++ netpanzer.spec 1 Jun 2010 19:51:17 -0000 1.15
@@ -1,19 +1,20 @@
Name: netpanzer
-Version: 0.8.3.svn1215
-Release: 1%{?dist}
+Version: 0.8.3.svn612010
+Release: 2%{?dist}
Summary: An Online Multiplayer Tactical Warfare Game
Group: Amusements/Games
License: GPLv2+
URL: http://netpanzer.berlios.de
#Source0: http://download.berlios.de/netpanzer/netpanzer-%{version}.tar.bz2
-#SVN checkout done 3/31/2010 from svn://svn.berlios.de/netpanzer/trunk/netpanzer
-Source0: netpanzer-svn1215.tar.bz2
+#SVN checkout done 6/1/2010 from http://svn.berlios.de/svnroot/repos/netpanzer/tags/netpanzer/0.8.3
+Source0: netpanzer-0.8.3.tar.bz2
Patch0: netpanzer-desktop.patch
#Patch1: netpanzer-0.8.2-Pallette-memory.patch
#Patch2: netpanzer-0.8.2-ColorTable-memory.patch
#Patch3: netpanzer-0.8.2-Log-algorithm.patch
Patch4: netpanzer-0.8.2-MapSelectionView-memory.patch
+Patch5: netpanzer-0.8.3-scons-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: physfs-devel >= 0.1.9, desktop-file-utils, doxygen, scons
@@ -33,7 +34,7 @@ with a set of new units. Players can joi
time.
%prep
-%setup -qn netpanzer-svn1215
+%setup -qn netpanzer-0.8.3
# Strip \r from RELNOTES file
sed -i 's/\r//' RELNOTES
@@ -45,6 +46,7 @@ sed -i 's/\r//' RELNOTES
#%patch2 -p0
#%patch3 -p0
%patch4 -p0
+%patch5 -p0
%build
scons datadir=%{_datadir}/netpanzer %{?_smp_mflags}
@@ -61,6 +63,7 @@ cp -pr powerups/ $RPM_BUILD_ROOT%{_datad
cp -pr scripts/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
cp -pr units/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
cp -pr wads/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr sound/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
# Install desktop item
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/netpanzer.desktop
@@ -100,6 +103,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpanzer
%changelog
+* Tue Jun 01 2010 Jon Ciesla <limb at jcomserv.net> 0.8.3-2
+- Correct checkout for 0.8.3 per upstream, BZ598120.
+- Scons fixes.
+- Added sound back in.
+
* Wed Mar 31 2010 Jon Ciesla <limb at jcomserv.net> 0.8.3-1
- New upstream release.
- Several patches upstreamed.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 2 Apr 2010 14:40:32 -0000 1.5
+++ sources 1 Jun 2010 19:51:17 -0000 1.6
@@ -1 +1 @@
-87d3da20569bb3092de32c8550061c79 netpanzer-svn1215.tar.bz2
+ca96da1cd3f77adb433cebf09089c33f netpanzer-0.8.3.tar.bz2
More information about the scm-commits
mailing list