packages: scorched3d/scorched3d-openal.patch, scorched3d/scorched3d.spec -=?UTF-8?Q?=20?=...

[lisu]

Author: lisu                         Date: Tue Feb 14 11:37:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 43.3

---- Files affected:
packages/scorched3d:
   scorched3d-openal.patch (1.2 -> 1.3) , scorched3d.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: packages/scorched3d/scorched3d-openal.patch
diff -u packages/scorched3d/scorched3d-openal.patch:1.2 packages/scorched3d/scorched3d-openal.patch:1.3
--- packages/scorched3d/scorched3d-openal.patch:1.2	Tue May  4 14:46:25 2010
+++ packages/scorched3d/scorched3d-openal.patch	Tue Feb 14 12:37:17 2012
@@ -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,23 +12,32 @@
 -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."
+-	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_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
--else
+-	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."
 -
--	if test x"$use_static_openal" = x"yes"; then
--		AL_LIBS="/usr/local/lib/libopenal.a"
+-		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)

================================================================
Index: packages/scorched3d/scorched3d.spec
diff -u packages/scorched3d/scorched3d.spec:1.46 packages/scorched3d/scorched3d.spec:1.47
--- packages/scorched3d/scorched3d.spec:1.46	Sun Feb 12 13:44:44 2012
+++ packages/scorched3d/scorched3d.spec	Tue Feb 14 12:37:17 2012
@@ -2,12 +2,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
@@ -100,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2012/02/14 11:37:17  lisu
+- up to 43.3
+
 Revision 1.46  2012/02/12 12:44:44  adamg
 - d'oh! install fix; release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scorched3d/scorched3d-openal.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scorched3d/scorched3d.spec?r1=1.46&r2=1.47&f=u