[cegui] Added a patch to avoid using locate for python detection

Martin Preisler mpreisle at fedoraproject.org
Tue Jan 24 09:54:30 UTC 2012


commit e0c1460df6f77257ffcce635af1c761d63a13577
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Tue Jan 24 10:54:00 2012 +0100

    Added a patch to avoid using locate for python detection

 cegui-0.7.6-python-detection.patch |   11 +++++++++++
 cegui.spec                         |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/cegui-0.7.6-python-detection.patch b/cegui-0.7.6-python-detection.patch
new file mode 100644
index 0000000..e14cd81
--- /dev/null
+++ b/cegui-0.7.6-python-detection.patch
@@ -0,0 +1,11 @@
+--- acinclude.m4.original	2012-01-24 10:42:16.066632295 +0100
++++ acinclude.m4	2012-01-24 10:43:15.800274030 +0100
+@@ -1411,7 +1411,7 @@
+ if test x$ax_python_bin != x; then
+    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+    AC_CHECK_HEADER([$ax_python_bin/Python.h],
+-   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
++   [[ax_python_header="/usr/include/$ax_python_bin"]],
+    ax_python_header=no)
+    if test x$ax_python_lib != xno; then
+      if test x$ax_python_header != xno; then
diff --git a/cegui.spec b/cegui.spec
index 56f27f8..639db22 100644
--- a/cegui.spec
+++ b/cegui.spec
@@ -3,12 +3,13 @@
 
 Name:           cegui
 Version:        0.7.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.cegui.org.uk
 Source0:        http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
+Patch0:         cegui-0.7.6-python-detection.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  DevIL-devel
@@ -151,6 +152,7 @@ OpenGLRenderer (module PyCEGUIOpenGLRenderer).
 
 %prep
 %setup -q -n CEGUI-%{version}
+%patch0 
 
 # Permission fixes for debuginfo RPM
 chmod -x cegui/include/falagard/*.h
@@ -256,7 +258,10 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Jan 23 2012 Martin Preisler <mpreisle at redhat.com 0.7.6-1
+* Tue Jan 24 2012 Martin Preisler <mpreisle at redhat.com> 0.7.6-2
+- Added a patch to avoid using locate for python detection
+
+* Mon Jan 23 2012 Martin Preisler <mpreisle at redhat.com> 0.7.6-1
 - New upstream release
 - Added python to build requirements
 - Added graphviz to build requirements


More information about the scm-commits mailing list