packages: python-PythonMagick/python-PythonMagick.spec, python-PythonMagick...

matkor matkor at pld-linux.org
Wed May 19 15:15:43 CEST 2010


Author: matkor                       Date: Wed May 19 13:15:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Release 2. Autoconf Python headers detection fix.

---- Files affected:
packages/python-PythonMagick:
   python-PythonMagick.spec (1.2 -> 1.3) , python-PythonMagick-ac_python_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-PythonMagick/python-PythonMagick.spec
diff -u packages/python-PythonMagick/python-PythonMagick.spec:1.2 packages/python-PythonMagick/python-PythonMagick.spec:1.3
--- packages/python-PythonMagick/python-PythonMagick.spec:1.2	Thu Sep 24 13:10:40 2009
+++ packages/python-PythonMagick/python-PythonMagick.spec	Wed May 19 15:15:37 2010
@@ -4,11 +4,12 @@
 Summary(pl.UTF-8):	Interfejs Pythona do ImageMagicka
 Name:		python-%{module}
 Version:	0.9.1
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		Development/Languages/Python
 Source0:	http://www.imagemagick.org/download/python/%{module}-%{version}.tar.lzma
 # Source0-md5:	fb6227e86628aa2f6eea04dcacfe013b
+Patch0:     %{name}-ac_python_fix.patch
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -25,6 +26,7 @@
 %define		filterout_cpp		-D_FORTIFY_SOURCE=[0-9]+
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+
 %description
 PythonMagick is the Python API for the ImageMagick.
 
@@ -34,6 +36,7 @@
 %prep
 %setup -q -c -T -n %{module}-%{version}
 lzma -dc %{SOURCE0} | tar xf - -C ..
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -70,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/05/19 13:15:37  matkor
+- Release 2. Autoconf Python headers detection fix.
+
 Revision 1.2  2009/09/24 11:10:40  matkor
 - Version 0.9.1-1.
 

================================================================
Index: packages/python-PythonMagick/python-PythonMagick-ac_python_fix.patch
diff -u /dev/null packages/python-PythonMagick/python-PythonMagick-ac_python_fix.patch:1.1
--- /dev/null	Wed May 19 15:15:43 2010
+++ packages/python-PythonMagick/python-PythonMagick-ac_python_fix.patch	Wed May 19 15:15:37 2010
@@ -0,0 +1,14 @@
+--- ./m4/ax_python.m4.ac_python_fix	2009-02-18 02:52:06.000000000 +0100
++++ ./m4/ax_python.m4	2010-05-19 14:56:12.000000000 +0200
+@@ -64,7 +64,10 @@ ax_python_bin=$PYTHON_BIN
+ 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=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
++   # Above version fails as we may not have locate on builders
++   [[ax_python_header=`ls /usr/include/$ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
++   # Consider using python-config --includes |awk '{sub("-I",""); print $1}' (bs at irc suggestion)
+    ax_python_header=no)
+    if test $ax_python_lib != no; then
+      if test $ax_python_header != no; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-PythonMagick/python-PythonMagick.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list