OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csmash?expand=0&rev=4

csmash-0.6.6-definitions.diff

@@ -0,0 +1,24 @@
+--- MultiPlay.cpp
++++ MultiPlay.cpp
+@@ -42,7 +42,9 @@
+ 
+ #else	/* ! WIN32 */
+ 
++#ifndef closesocket        /* see included ttincl.h */
+ #define closesocket(FD) close(FD)
++#endif
+ 
+ #endif
+ 
+--- Network.cpp
++++ Network.cpp
+@@ -41,7 +41,9 @@
+ 
+ #else	/* ! WIN32 */
+ 
++#ifndef closesocket        /* see included ttincl.h */
+ #define closesocket(FD) close(FD)
++#endif
+ 
+ #endif
+ 

csmash-0.6.6-uninitialized.diff

@@ -0,0 +1,18 @@
+--- Event.cpp
++++ Event.cpp
+@@ -16,6 +16,7 @@
+ // along with this program; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
++#include <sys/time.h>
+ #include "ttinc.h"
+ #include "Event.h"
+ #include "Control.h"
+@@ -140,6 +141,7 @@
+ #ifdef WIN32
+   ftime( &tb );
+ #else
++  ftime( &tb );
+   gettimeofday( &tv, &tz );
+   tb.time = tv.tv_sec;
+   tb.millitm = tv.tv_usec/1000;

csmash-0.6.6_new-gcc.patch

@@ -1,28 +0,0 @@
---- 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;

csmash.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Nov 12 14:34:30 CET 2007 - lmichnovic@suse.cz
+
+- using find_lang macro
+- fixed uninitilized variable (uninitialized.diff)
+
+-------------------------------------------------------------------
+Fri Nov  9 17:32:17 CET 2007 - lmichnovic@suse.cz
+
+- using fdupes macro
+- not installing files INSTALL, NEWS (zero lenght)
+- renamed last patch to *definitions.diff
+
 -------------------------------------------------------------------
 Thu Oct 25 18:18:33 CEST 2007 - pgajdos@suse.cz
 

csmash.spec

@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           csmash
-BuildRequires:  SDL_image-devel SDL_mixer-devel gcc-c++ gtk1-compat-devel libdrm-devel update-desktop-files xorg-x11-devel
+BuildRequires:  SDL_image-devel SDL_mixer-devel fdupes gcc-c++ gtk1-compat-devel libdrm-devel update-desktop-files xorg-x11-devel
 License:        GPL v2 or later
 Group:          Amusements/Games/3D/Other
 AutoReqProv:    on
 Version:        0.6.6
-Release:        128
+Release:        136
 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
-Patch5:         %{name}-%{version}_new-gcc.patch
+Patch5:         %{name}-%{version}-definitions.diff
+Patch6:         %{name}-%{version}-uninitialized.diff
 Url:            http://cannonsmash.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        3D Table Tennis Game
@@ -46,6 +47,7 @@ Authors:
 %patch3
 %patch4
 %patch5
+%patch6
 mv README README.jp
 cp README.en README
 %{?suse_update_config:%{suse_update_config -f}}
@@ -70,18 +72,27 @@ make %{?jobs:-j%jobs} CXXFLAGS="-I/usr/include -I/usr/include/SDL -D_GNU_SOURCE=
 make DESTDIR=$RPM_BUILD_ROOT install
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/csmash
 %suse_update_desktop_file -i %name Game SportsGame
+%fdupes -s  $RPM_BUILD_ROOT
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,755)
 %{_bindir}/csmash
-%{_datadir}/locale/*/LC_MESSAGES/csmash.mo
+#%{_datadir}/locale/*/LC_MESSAGES/csmash.mo
 %{_datadir}/csmash
-%doc README README.jp AUTHORS COPYING CREDITS INSTALL NEWS ChangeLog
+%doc README README.jp AUTHORS COPYING CREDITS ChangeLog
 /usr/share/applications/%name.desktop
 %changelog
+* Mon Nov 12 2007 - lmichnovic@suse.cz
+- using find_lang macro
+- fixed uninitilized variable (uninitialized.diff)
+* Fri Nov 09 2007 - lmichnovic@suse.cz
+- using fdupes macro
+- not installing files INSTALL, NEWS (zero lenght)
+- renamed last patch to *definitions.diff
 * Thu Oct 25 2007 - pgajdos@suse.cz
 - fixed build with new gcc 4.3
 * Fri Mar 23 2007 - lmichnovic@suse.cz