rpms/netpanzer/devel gcc-4.1-extra-qualification.patch, NONE, 1.1 netpanzer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hugo Cisneiros (eitch) fedora-extras-commits at redhat.com
Thu May 4 21:13:32 UTC 2006


Author: eitch

Update of /cvs/extras/rpms/netpanzer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5389/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gcc-4.1-extra-qualification.patch netpanzer.spec 
Log Message:
auto-import netpanzer-0.8-3 on branch devel from netpanzer-0.8-3.src.rpm

gcc-4.1-extra-qualification.patch:

--- NEW FILE gcc-4.1-extra-qualification.patch ---
diff -ur netpanzer-0.8.orig/src/Lib/Network/Address.hpp netpanzer-0.8/src/Lib/Network/Address.hpp
--- netpanzer-0.8.orig/src/Lib/Network/Address.hpp	2004-10-14 10:22:50.000000000 -0300
+++ netpanzer-0.8/src/Lib/Network/Address.hpp	2006-05-01 05:58:05.000000000 -0300
@@ -34,7 +34,7 @@
     /** resolves a hostname or IP-Number together with a port and returns a
      * new Address object.
      */
-    static Address Address::resolve(const std::string& name, uint16_t port);
+    static Address resolve(const std::string& name, uint16_t port);
 
     /** returns the ip address of this Address as string */
     std::string getIP() const;
diff -ur netpanzer-0.8.orig/src/NetPanzer/Classes/PlayerState.hpp netpanzer-0.8/src/NetPanzer/Classes/PlayerState.hpp
--- netpanzer-0.8.orig/src/NetPanzer/Classes/PlayerState.hpp	2004-12-25 20:58:39.000000000 -0200
+++ netpanzer-0.8/src/NetPanzer/Classes/PlayerState.hpp	2006-05-01 05:58:36.000000000 -0300
@@ -81,8 +81,8 @@
 public:
     PlayerUnitConfig unit_config;
 
-    PlayerState::PlayerState();
-    PlayerState::PlayerState(const PlayerState& other);
+    PlayerState();
+    PlayerState(const PlayerState& other);
 
     void operator= (const PlayerState& other);
 
diff -ur netpanzer-0.8.orig/src/NetPanzer/Interfaces/Console.cpp netpanzer-0.8/src/NetPanzer/Interfaces/Console.cpp
--- netpanzer-0.8.orig/src/NetPanzer/Interfaces/Console.cpp	2004-11-22 14:19:54.000000000 -0200
+++ netpanzer-0.8/src/NetPanzer/Interfaces/Console.cpp	2006-05-01 05:58:56.000000000 -0300
@@ -46,7 +46,7 @@
         setp(buf, buf+sizeof(buf));
     }
 
-    FileStampStreamBuf::~FileStampStreamBuf()
+    ~FileStampStreamBuf()
     {
         sync();
         if(file)


--- NEW FILE netpanzer.spec ---
Name:           netpanzer
Version:        0.8
Release:        3%{?dist}
Summary:        An Online Multiplayer Tactical Warfare Game

Group:          Amusements/Games
License:        GPL
URL:            http://netpanzer.berlios.de
Source0:        http://download.berlios.de/netpanzer/netpanzer-%{version}.tar.bz2
Patch0:		gcc-4.1-extra-qualification.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jam, physfs-devel >= 0.1.9, desktop-file-utils, doxygen
BuildRequires:	SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
#Requires:       SDL >= 1.2.5, SDL_mixer >= 1.2, SDL_image >= 1.2, physfs >= 0.1.9
Requires:	netpanzer-data = %{version}

%description
netPanzer is an online multiplayer tactical warfare game designed for FAST
ACTION combat. Gameplay concentrates on the core -- no resource management is
needed. The game is based on quick tactical action and unit management in
real-time. Battles progress quickly and constantly as destroyed players respawn
with a set of new units. Players can join or leave multiplayer games at any
time.

%prep
%setup -q
%patch0 -p1

# Strip \r from RELNOTES file
sed -i 's/\r//' RELNOTES

%build
%configure
jam %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
jam install

# 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 \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps

desktop-file-install --vendor fedora				\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
	--add-category X-Fedora					\
	netpanzer.desktop

%post
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
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README RELNOTES TODO docs/serverhowto.html docs/tipofday.txt
%{_bindir}/netpanzer
%{_datadir}/applications/fedora-netpanzer.desktop
%{_datadir}/icons/hicolor/48x48/apps/netpanzer.png


%changelog
* Thu May  4 2006 Hugo Cisneiros <hugo at devin.com.br> 0.8-3
- Changed netpanzer.png to comply with freedesktop.org standards.
- Added scripts to update the icon cache after installing

* Mon May  1 2006 Hugo Cisneiros <hugo at devin.com.br> 0.8-2
- Changed Package's RPM Group
- Fixed Changelog entries to specify versions
- Stripped '\r' EOL from RELNOTES file
- Added COPYING file

* Mon May  1 2006 Hugo Cisneiros <hugo at devin.com.br> 0.8-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netpanzer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 May 2006 21:11:45 -0000	1.1
+++ .cvsignore	4 May 2006 21:13:32 -0000	1.2
@@ -0,0 +1 @@
+netpanzer-0.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netpanzer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 May 2006 21:11:45 -0000	1.1
+++ sources	4 May 2006 21:13:32 -0000	1.2
@@ -0,0 +1 @@
+c08c1b703eac533407db02510deca68e  netpanzer-0.8.tar.bz2




More information about the fedora-extras-commits mailing list