- updated to 3.3.1.2

- updated make patch

diff --git a/rocksndiamonds-make.patch b/rocksndiamonds-make.patch
index 90e1d7bca35a037261ee0ac4182af9adc203ef42..e93359fa06e99e20c378b92bf5ed2c817951fcaf 100644 (file)
--- a/rocksndiamonds-make.patch
+++ b/rocksndiamonds-make.patch
@@ -1,6 +1,6 @@
---- rocksndiamonds-3.2.6.1/src/Makefile.orig   2009-06-15 22:47:52.000000000 +0200
-+++ rocksndiamonds-3.2.6.1/src/Makefile        2009-11-29 18:33:43.414775288 +0100
-@@ -47,12 +47,12 @@
+--- rocksndiamonds-3.3.1.2/src/Makefile.orig   2013-11-24 14:05:56.000000000 +0100
++++ rocksndiamonds-3.3.1.2/src/Makefile        2016-09-25 21:06:51.925503564 +0200
+@@ -49,12 +49,12 @@
  # -----------------------------------------------------------------------------
  
  ifeq ($(PLATFORM),solaris)            # native compiling to Solaris
@@ -15,7 +15,7 @@
  PLATFORM = unix
  TARGET = sdl
  endif
-@@ -61,7 +61,7 @@
+@@ -63,7 +63,7 @@
  RANLIB = echo
  PROGNAME = ../$(PROGBASE).exe
  EXTRA_CFLAGS = -Zbin-files -D__ST_MT_ERRNO__ -Zmtd -fomit-frame-pointer
@@ -24,7 +24,7 @@
  PLATFORM = unix
  TARGET = x11
  endif
-@@ -72,7 +72,7 @@
+@@ -74,7 +74,7 @@
  
  ifeq ($(PLATFORM),cross-win32)                # cross-compiling to Windows
  PROGNAME = ../$(PROGBASE).exe
@@ -33,7 +33,7 @@
  TARGET = sdl
  endif
  
-@@ -86,7 +86,7 @@
+@@ -88,7 +88,7 @@
  PROGBASE = rocks
  PROGNAME = ../$(PROGBASE).exe
  SYS_CFLAGS = -DTARGET_X11
@@ -42,7 +42,7 @@
  RM = del
  endif
  
-@@ -97,24 +97,24 @@
+@@ -99,24 +99,24 @@
  
  ifeq ($(TARGET),x11)                  # compiling for X11 target
  SYS_CFLAGS  = -DTARGET_X11 $(X11_INCL)
@@ -52,17 +52,15 @@
  
  ifeq ($(TARGET),sdl)                  # compiling for SDL target
  SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
--SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
 -SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
-+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 +SYS_LIBS = $(SDL_LIBS) $(shell sdl-config --libs)
  endif
  
  ifeq ($(TARGET),sdl-static)           # compiling for SDL target (static)
  SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
--SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg -lmikmod
 -SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
-+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 +SYS_LIBS = $(SDL_LIBS) $(shell sdl-config --static-libs)
  endif
  
@@ -73,7 +71,7 @@
  endif
  
  
-@@ -161,7 +161,7 @@
+@@ -163,7 +163,7 @@
  endif
  
  CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
@@ -82,8 +80,8 @@
  
  
  SRCS =        main.c          \
-@@ -249,7 +249,7 @@
- all: libgame_dir game_em_dir $(PROGNAME)
+@@ -258,7 +258,7 @@
+ all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME)
  
  $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 -      $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)

diff --git a/rocksndiamonds.spec b/rocksndiamonds.spec
index 373e23ff73b0d10c5c17483a1a1a1923824433f3..3224fd05a62257b0162529a9ffa7400500d54580 100644 (file)
--- a/rocksndiamonds.spec
+++ b/rocksndiamonds.spec
@@ -2,12 +2,12 @@ Summary:      Boulderdash clone
 Summary(pl.UTF-8):     Klon Boulderdasha
 Summary(pt_BR.UTF-8):  Jogo tipo Boulderdash de pegar diamantes com mais de 10.000 níveis
 Name:          rocksndiamonds
-Version:       3.3.0.1
-Release:       2
+Version:       3.3.1.2
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://www.artsoft.org/RELEASES/unix/rocksndiamonds/%{name}-%{version}.tar.gz
-# Source0-md5: 813ced99d54f89db7c593c518d197d18
+# Source0-md5: 9fb7d125a314f55c5148c0e47f9ebb42
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-tape.patch