- 0.1.7

Changed files:
    xmoto-opt.patch -> 1.3
    xmoto-types.patch -> 1.3
    xmoto.spec -> 1.7

diff --git a/xmoto-opt.patch b/xmoto-opt.patch
index aea4f42a418d74a6326b0ca2caff8cfed2d64c12..004e936bbc49836147a2a38b984d6336125d7f24 100644 (file)
--- a/xmoto-opt.patch
+++ b/xmoto-opt.patch
@@ -1,12 +1,11 @@
-diff -ruN xmoto-0.1.6./Makefile.am xmoto-0.1.6/Makefile.am
---- xmoto-0.1.6./Makefile.am   2005-10-01 13:06:04.000000000 +0200
-+++ xmoto-0.1.6/Makefile.am    2005-10-07 13:45:57.986461750 +0200
-@@ -1,6 +1,6 @@
- INCLUDES = -Isrc
--CXXFLAGS = -w -O3 -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
--CFLAGS = -w -O3 -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
-+CXXFLAGS = -w $(OPTFLAGS) -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
-+CFLAGS = -w $(OPTFLAGS) -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
+diff -ruN xmoto-0.1.7./Makefile.am xmoto-0.1.7/Makefile.am
+--- xmoto-0.1.7./Makefile.am   2005-10-26 21:55:34.000000000 +0200
++++ xmoto-0.1.7/Makefile.am    2005-10-27 18:54:12.838200500 +0200
+@@ -1,5 +1,5 @@
+-CXXFLAGS = -DNOMMGR -w -O2 -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
+-CFLAGS = -DNOMMGR -w -O2 -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
++CXXFLAGS = -DNOMMGR -w $(OPTFLAGS) -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
++CFLAGS = -DNOMMGR -w $(OPTFLAGS) -DGAMEDATADIR=\"$(datadir)/@PACKAGE@\"
  SUBDIRS = bin
  
  image_SOURCES = src/image/tim.cpp src/image/tim_io_stdio.cpp \

diff --git a/xmoto-types.patch b/xmoto-types.patch
index 4103919fa15b0252b8d16068b4e5aef9c83fded9..f7e52991eb8e543bebed947cebe4bb9bef5adbd5 100644 (file)
--- a/xmoto-types.patch
+++ b/xmoto-types.patch
@@ -1,15 +1,15 @@
-diff -ruN xmoto-0.1.6./src/VCommon.h xmoto-0.1.6/src/VCommon.h
---- xmoto-0.1.6./src/VCommon.h 2005-10-07 13:16:29.000000000 +0200
-+++ xmoto-0.1.6/src/VCommon.h  2005-10-07 13:18:46.341356000 +0200
+diff -ruN xmoto-0.1.7./src/VCommon.h xmoto-0.1.7/src/VCommon.h
+--- xmoto-0.1.7./src/VCommon.h 2005-10-27 17:06:43.000000000 +0200
++++ xmoto-0.1.7/src/VCommon.h  2005-10-27 18:55:43.047838250 +0200
 @@ -37,10 +37,9 @@
- \r
- #include <GL/gl.h>\r
+ 
+ #include <GL/gl.h>
  
 -#if defined(WIN32) && defined(_MSC_VER)
--  #define GL_GLEXT_PROTOTYPES 1\r
+-  #define GL_GLEXT_PROTOTYPES 1
 -  #include "glext.h"
 -#else
-+#define GL_GLEXT_PROTOTYPES 1\r
++#define GL_GLEXT_PROTOTYPES 1
 +#include <GL/glext.h>
 +#if !defined(GL_ARRAY_BUFFER_ARB)
    /* This aren't elegant. It would be nicer to use glext.h, but I can't get

diff --git a/xmoto.spec b/xmoto.spec
index 155d7cbf39f40ba5e7a23d0ac8c35e1da3d4f01a..baa20945ff813f887b26a357cd2f0c2e20f720d9 100644 (file)
--- a/xmoto.spec
+++ b/xmoto.spec
@@ -1,16 +1,14 @@
-#
 Summary:       Clone of across/elma games
 Summary(pl):   Klon gry across/elma
 Name:          xmoto
-Version:       0.1.6
+Version:       0.1.7
 Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       http://dl.sourceforge.net/xmoto/%{name}-%{version}-src.tar.gz
-# Source0-md5: b5d11e0f90ab5ff886c1dc90fa15cb2e
+# Source0-md5: 8a1452b2e9209eb2f10945180f589e57
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-types.patch
-Patch2:                %{name}-shared_libs.patch
 URL:           http://xmoto.sourceforge.net/
 BuildRequires: OpenGL-devel
 BuildRequires: SDL-devel
@@ -45,7 +43,6 @@ wynikami, swoimi i innych, w wy
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}