From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sun, 13 Feb 2011 09:46:54 +0000 (+0000)
Subject: - rel 9; fix python detection
X-Git-Tag: auto/th/crossfire-1_9_1-9
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossfire.git;a=commitdiff_plain;h=ae447a11e1cea45d802d039b8038831ace0ab088

- rel 9; fix python detection

Changed files:
    crossfire-python.patch -> 1.3
    crossfire.spec -> 1.55
---

diff --git a/crossfire-python.patch b/crossfire-python.patch
new file mode 100644
index 0000000..a446c27
--- /dev/null
+++ b/crossfire-python.patch
@@ -0,0 +1,29 @@
+--- crossfire-1.9.1/acinclude.m4~	2011-02-13 10:39:46.944104327 +0100
++++ crossfire-1.9.1/acinclude.m4	2011-02-13 10:42:41.044603409 +0100
+@@ -6,7 +6,7 @@
+ 	PY_INCLUDES=""
+ 	dir=""
+ 	if test "x$PYTHON_HOME" != "x"; then
+-		for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
++		for pyver in "" 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
+ 			dir=$PYTHON_HOME/include/python${pyver}
+ 			AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
+ 			if test "x$cf_have_python_h" != "x" ; then
+@@ -20,7 +20,7 @@
+                 PY_INCLUDES=""	
+ 		if test "x$cf_have_python_h" = "x"  ; then
+ 			for ldir in  "" /local ; do
+-			for pyver in  "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
++			for pyver in  "" 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
+ 				dir=/usr${ldir}/include/python${pyver}
+ 				AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
+ 				if test "x$cf_have_python_h" != "x" ; then
+@@ -67,7 +67,7 @@
+ 			fi
+ 
+ 		else
+-	                for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
++	                for pyver in "" 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
+ 	                        AC_CHECK_LIB(python$pyver, PyArg_ParseTuple,[PYTHON_LIB="-lpython$pyver"])
+ 	                        if test "x$PYTHON_LIB" != "x" ; then
+ 	                                break
diff --git a/crossfire.spec b/crossfire.spec
index 82d42e5..9f50ed7 100644
--- a/crossfire.spec
+++ b/crossfire.spec
@@ -2,7 +2,7 @@ Summary:	Multiplayer roguelike game server
 Summary(pl.UTF-8):	Serwer gry roguelike dla wielu graczy
 Name:		crossfire
 Version:	1.9.1
-Release:	8
+Release:	9
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Source3:	%{name}.logrotate
 Patch0:		%{name}-ac260.patch
 Patch1:		%{name}-check.patch
 Patch2:		%{name}-daemon.patch
+Patch3:		%{name}-python.patch
 URL:		http://crossfire.real-time.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -100,6 +101,7 @@ Wtyczka animacji dla serwera Crossfire.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}