rpms/netpanzer/F-13 netpanzer.spec,1.13,1.14 sources,1.4,1.5
Jon Ciesla
limb at fedoraproject.org
Fri Apr 2 14:40:32 UTC 2010
Author: limb
Update of /cvs/pkgs/rpms/netpanzer/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25253/F-13
Modified Files:
netpanzer.spec sources
Log Message:
New upstream.
Index: netpanzer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/F-13/netpanzer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- netpanzer.spec 26 Aug 2009 06:16:11 -0000 1.13
+++ netpanzer.spec 2 Apr 2010 14:40:32 -0000 1.14
@@ -1,20 +1,22 @@
Name: netpanzer
-Version: 0.8.2
-Release: 8%{?dist}
+Version: 0.8.3.svn1215
+Release: 1%{?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
+#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
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
+#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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: jam, physfs-devel >= 0.1.9, desktop-file-utils, doxygen
+BuildRequires: physfs-devel >= 0.1.9, desktop-file-utils, doxygen, scons
BuildRequires: SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
Obsoletes: netpanzer-data <= 0.8
Provides: netpanzer-data = %{version}-%{release}
@@ -31,7 +33,7 @@ with a set of new units. Players can joi
time.
%prep
-%setup -q
+%setup -qn netpanzer-svn1215
# Strip \r from RELNOTES file
sed -i 's/\r//' RELNOTES
@@ -39,27 +41,33 @@ sed -i 's/\r//' RELNOTES
#Correct .desktop file
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+#%patch1 -p0
+#%patch2 -p0
+#%patch3 -p0
%patch4 -p0
%build
-%configure
-jam %{?_smp_mflags}
-
+scons datadir=%{_datadir}/netpanzer %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-export DESTDIR=$RPM_BUILD_ROOT
-jam install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 netpanzer $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr cache/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr maps/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr pics/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr powerups/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr scripts/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr units/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
+cp -pr wads/ $RPM_BUILD_ROOT%{_datadir}/netpanzer/
# Install desktop item
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/netpanzer.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/netpanzer.xpm
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/netpanzer.png \
+mv netpanzer.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
desktop-file-install --vendor fedora \
@@ -92,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpanzer
%changelog
+* Wed Mar 31 2010 Jon Ciesla <limb at jcomserv.net> 0.8.3-1
+- New upstream release.
+- Several patches upstreamed.
+- Moved from jam to scons.
+
* Tue Aug 25 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.8.2-8
- Rebuild for new libphysfs API bump to fix broken deps
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpanzer/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 30 Aug 2007 11:23:02 -0000 1.4
+++ sources 2 Apr 2010 14:40:32 -0000 1.5
@@ -1 +1 @@
-3f446403ac7e72ed0ff9e093517c83d3 netpanzer-0.8.2.tar.bz2
+87d3da20569bb3092de32c8550061c79 netpanzer-svn1215.tar.bz2
More information about the scm-commits
mailing list