- up to 43.3

Changed files:
    scorched3d-openal.patch -> 1.3
    scorched3d.spec -> 1.47

diff --git a/scorched3d-openal.patch b/scorched3d-openal.patch
index 9e8fef75078e9f2127d572058f908c0006bcfa4e..355017d1ffa377b2f95b739006cbd6ae60f9bc47 100644 (file)
--- a/scorched3d-openal.patch
+++ b/scorched3d-openal.patch
@@ -1,6 +1,6 @@
---- scorched/configure-al.m4~  2009-10-02 00:22:31.000000000 +0200
-+++ scorched/configure-al.m4   2010-05-04 13:58:31.557872694 +0200
-@@ -1,109 +1,8 @@
+--- scorched3d-43.3/configure-al.m4~   2011-12-31 15:51:36.000000000 +0100
++++ scorched3d-43.3/configure-al.m4    2012-02-14 12:34:50.668902374 +0100
+@@ -1,118 +1,8 @@
  dnl Checking for OpenAL
 -AC_ARG_WITH([openal-static],
 -            AC_HELP_STRING([--with-openal-static],
@@ -12,24 +12,33 @@
 -AC_MSG_CHECKING(for OpenAL support)
 -AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
 -if test x$OPENAL_CONFIG = xno; then
--      echo "*** The openal-config script installed by OpenAL could not be found"
--      echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
--      echo "*** environment variable to the full path to openal-config."
--
--      AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
--else
--
--      if test x"$use_static_openal" = x"yes"; then
--              AL_LIBS="/usr/local/lib/libopenal.a"
+-      echo "The openal-config script installed by OpenAL could not be found"
+-      echo "Make sure openal-config is in your path, or set the OPENAL_CONFIG"
+-      echo "environment variable to the full path to openal-config."
+-      echo "Trying pkg-config instead."
+-
+-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-      if test x$PKG_CONFIG = xno; then
+-              echo "The pkg-config script could not be found"
+-              echo "Make sure pkg-config is in your path, or set the PKG_CONFIG"
+-              echo "environment variable to the full path to pkg-config."
+-
+-              AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
 -      else
--              AL_LIBS="`$OPENAL_CONFIG --libs`"
+-              OPENAL_CONFIG="$PKG_CONFIG openal";
 -      fi
+-fi
 -      
--      AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
--      AC_MSG_RESULT(yes)
+-if test x"$use_static_openal" = x"yes"; then
+-      AL_LIBS="/usr/local/lib/libopenal.a"
+-else
+-      AL_LIBS="`$OPENAL_CONFIG --libs`"
 -fi
 -
+-AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
+-
+-AC_MSG_RESULT(yes)
+-
 -AC_MSG_CHECKING(for Freealut support)
 -AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
 -if test x$FREEALUT_CONFIG = xno; then

diff --git a/scorched3d.spec b/scorched3d.spec
index dd5e273df9dbf0a386506fb56dee36d03af39b6e..596a61413b093709e4c0d426ecc1ba9b492e9267 100644 (file)
--- a/scorched3d.spec
+++ b/scorched3d.spec
@@ -1,12 +1,12 @@
 Summary:       A 3D version of the classic DOS game Scorched Earth
 Summary(pl.UTF-8):     Wersja 3D klasycznej DOS-owej gry Scorched Earth
 Name:          scorched3d
-Version:       43.2a
-Release:       6
+Version:       43.3
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
 Source0:       http://downloads.sourceforge.net/scorched3d/Scorched3D-%{version}-src.tar.gz
-# Source0-md5: 876de173218fd83a2b0a30255ba694fa
+# Source0-md5: 3e4aa690ddb2d7dfa26d283faf59f897
 Source1:       %{name}.desktop
 Patch0:                %{name}-types.patch
 Patch1:                %{name}-openal.patch