From 5535683548e86a034aeaa35a2c87a17294d671b89b7f66b5b6adada5c1fde62b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 25 Oct 2007 23:42:30 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/csmash?expand=0&rev=3

---
 csmash-0.6.6_new-gcc.patch | 28 ++++++++++++++++++++++++++++
 csmash.changes             |  5 +++++
 csmash.spec                | 13 ++++++++-----
 3 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 csmash-0.6.6_new-gcc.patch

diff --git a/csmash-0.6.6_new-gcc.patch b/csmash-0.6.6_new-gcc.patch
new file mode 100644
index 0000000..432c2c6
--- /dev/null
+++ b/csmash-0.6.6_new-gcc.patch
@@ -0,0 +1,28 @@
+--- MultiPlay.cpp
++++ MultiPlay.cpp
+@@ -42,9 +42,9 @@
+ typedef int socklen_t;		/* mimic Penguin's typedef */
+ 
+ #else	/* ! WIN32 */
+-
++#if !defined closesocket        /* see included ttincl.h */
+ #define closesocket(FD) close(FD)
+-
++#endif
+ #endif
+ 
+ extern long mode;
+--- Network.cpp
++++ Network.cpp
+@@ -41,9 +41,9 @@
+ typedef int socklen_t;		/* mimic Penguin's typedef */
+ 
+ #else	/* ! WIN32 */
+-
++#if !defined closesocket        /* see included ttincl.h */
+ #define closesocket(FD) close(FD)
+-
++#endif
+ #endif
+ 
+ bool endian;
diff --git a/csmash.changes b/csmash.changes
index 82418a9..8d0d0cf 100644
--- a/csmash.changes
+++ b/csmash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 25 18:18:33 CEST 2007 - pgajdos@suse.cz
+
+- fixed build with new gcc 4.3 
+
 -------------------------------------------------------------------
 Fri Mar 23 18:49:59 CET 2007 - lmichnovic@suse.cz
 
diff --git a/csmash.spec b/csmash.spec
index ab72b22..eefd236 100644
--- a/csmash.spec
+++ b/csmash.spec
@@ -12,11 +12,11 @@
 
 Name:           csmash
 BuildRequires:  SDL_image-devel SDL_mixer-devel gcc-c++ gtk1-compat-devel libdrm-devel update-desktop-files xorg-x11-devel
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          Amusements/Games/3D/Other
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        0.6.6
-Release:        60
+Release:        128
 Source:         %{name}-%{version}.tar.bz2
 Source1:        danslatristesse2-48.ogg
 Source2:        %name.desktop
@@ -24,7 +24,8 @@ Patch:          %{name}-%{version}.diff
 Patch2:         %{name}-%{version}-datadir.diff
 Patch3:         %{name}-%{version}-return_value.diff
 Patch4:         %{name}-%{version}-qualification.diff
-URL:            http://cannonsmash.sourceforge.net/
+Patch5:         %{name}-%{version}_new-gcc.patch
+Url:            http://cannonsmash.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        3D Table Tennis Game
 
@@ -44,6 +45,7 @@ Authors:
 %patch2 -p1
 %patch3
 %patch4
+%patch5
 mv README README.jp
 cp README.en README
 %{?suse_update_config:%{suse_update_config -f}}
@@ -79,8 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/csmash
 %doc README README.jp AUTHORS COPYING CREDITS INSTALL NEWS ChangeLog
 /usr/share/applications/%name.desktop
-
 %changelog
+* Thu Oct 25 2007 - pgajdos@suse.cz
+- fixed build with new gcc 4.3
 * Fri Mar 23 2007 - lmichnovic@suse.cz
 - forcing use of CXXFLAGS for compilation
 * Mon Aug 07 2006 - lmichnovic@suse.cz