rpms/csmash/devel csmash-0.6.6-64bit-fixes.patch, NONE, 1.1 csmash.spec, 1.3, 1.4

[Matthias Saou (thias)]

Changeset from: thias

Update of /cvs/extras/rpms/csmash/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv23523

Modified Files:
	csmash.spec 
Added Files:
	csmash-0.6.6-64bit-fixes.patch 
Log Message:
Merge in current changes and add fix for x86_64.


csmash-0.6.6-64bit-fixes.patch:

--- NEW FILE csmash-0.6.6-64bit-fixes.patch ---
--- ./loadparts.cpp.gege	2003-11-19 17:49:31.000000000 +0100
+++ ./loadparts.cpp	2004-01-22 18:22:24.864717067 +0100
@@ -245,7 +245,7 @@
 
 	while ('\\' == line[l-1]) {
             // concat next line(s)
-	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
+	    int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
 	    fgets(&line[l-2], bufsize, fp);
 	    if (feof((FILE*)fp)) break;
 	    l = strlen(line);


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csmash.spec	9 Nov 2004 02:44:52 -0000	1.3
+++ csmash.spec	16 Nov 2004 17:29:28 -0000	1.4
@@ -1,20 +1,17 @@
 # $Id$
 # Authority: matthias
 
-%define desktop_vendor freshrpms
-
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 2.1.fc2.fr
+Release: 5
 License: GPL
 Group: Amusements/Games
-Source: http://dl.sf.net/cannonsmash/%{name}-%{version}.tar.gz
 URL: http://cannonsmash.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: Mesa, libjpeg, gtk2 >= 2.0.0
-Requires: SDL >= 1.2.0, SDL_mixer, SDL_image
-BuildRequires: Mesa-devel, libjpeg-devel, gtk2-devel >= 2.0.0
+Source: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
+Patch: csmash-0.6.6-64bit-fixes.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: Mesa-devel, libjpeg-devel, zlib-devel, gtk2-devel >= 2.0.0
 BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel
 BuildRequires: gcc-c++, desktop-file-utils
 
@@ -27,6 +24,7 @@
 
 %prep
 %setup
+%patch -p0 -b .64bit
 
 
 %build
@@ -47,16 +45,16 @@
 Comment=3D tabletennis game
 Exec=csmash
 Icon=%{_datadir}/games/%{name}/images/PenAttack.jpg
-Terminal=0
+Terminal=false
 Type=Application
+Categories=Application;Game;
+Encoding=UTF-8
 EOF
 
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} \
-  --dir %{buildroot}%{_datadir}/applications    \
-  --add-category Application                    \
-  --add-category Game                           \
-  %{name}.desktop
+desktop-file-install --vendor fedora \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{name}.desktop
 
 
 %clean
@@ -67,11 +65,21 @@
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING CREDITS ChangeLog README README.en
 %{_bindir}/%{name}
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/games/%{name}
 
 
 %changelog
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-5
+- Bump release to provide Extras upgrade path.
+
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-4
+- Add 64bit-fixes patch from Mandrake Linux to fix x86_64 build.
+
+* Thu Sep 16 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-3
+- Added missing zlib-devel build dep for YDL4.
+- Removed explicit deps, they're all picked up automatically.
+
 * Tue May 18 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-2
 - Rebuild for Fedora Core 2.