Author: arekm Date: Sun Feb 13 09:46:59 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 9; fix python detection
---- Files affected: packages/crossfire: crossfire.spec (1.54 -> 1.55) , crossfire-python.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/crossfire/crossfire.spec diff -u packages/crossfire/crossfire.spec:1.54 packages/crossfire/crossfire.spec:1.55 --- packages/crossfire/crossfire.spec:1.54 Tue Nov 23 06:48:35 2010 +++ packages/crossfire/crossfire.spec Sun Feb 13 10:46:54 2011 @@ -3,7 +3,7 @@ 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 @@ -14,6 +14,7 @@ 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 @@ -101,6 +102,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} @@ -202,6 +204,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.55 2011/02/13 09:46:54 arekm +- rel 9; fix python detection + Revision 1.54 2010/11/23 05:48:35 arekm - release 8 ================================================================ Index: packages/crossfire/crossfire-python.patch diff -u /dev/null packages/crossfire/crossfire-python.patch:1.3 --- /dev/null Sun Feb 13 10:46:59 2011 +++ packages/crossfire/crossfire-python.patch Sun Feb 13 10:46:54 2011 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossfire/crossfire.spec?r1=1.54&r2=1.55&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossfire/crossfire-python.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
