Author: ghibo
Date: Sun Feb 18 22:46:03 2007
New Revision: 122569
Added:
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-python.patch
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-python64.patch
Modified:
packages/cooker/cinepaint/current/SPECS/cinepaint.spec
Log:
- Added libgimp-devel and libxmu-devel to BuildRequires.
- Added Patch4 & 5 for python 2.5 & 64bit python.
Added: packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-python.patch
==============================================================================
--- (empty file)
+++ packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-python.patch
Sun Feb 18 22:46:03 2007
@@ -0,0 +1,11 @@
+--- cinepaint-0.21-2/configure.in.python 2007-02-18 16:19:52.000000000
-0500
++++ cinepaint-0.21-2/configure.in 2007-02-18 16:20:35.000000000 -0500
+@@ -478,7 +478,7 @@
+ AC_ARG_WITH(python,[ --with-python=path Set location of Python
executable],[ PYBIN="$withval"], [PYBIN=])
+ dnl First figure out the name of the Python executable
+ if test -z "$PYBIN"; then
+-AC_CHECK_PROGS(PYTHON, python python2.4 python2.3 python2.2 python2.1
python2.0 python1.6 python1.5 python1.4 python)
++AC_CHECK_PROGS(PYTHON, python python2.5 python2.4 python2.3 python2.2
python2.1 python2.0 python1.6 python1.5 python1.4 python)
+ else
+ PYTHON="$PYBIN"
+ fi
Added: packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-python64.patch
==============================================================================
--- (empty file)
+++ packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-python64.patch
Sun Feb 18 22:46:03 2007
@@ -0,0 +1,27 @@
+--- cinepaint-0.21-2/configure.in.64 2007-02-18 16:22:39.000000000 -0500
++++ cinepaint-0.21-2/configure.in 2007-02-18 16:24:31.000000000 -0500
+@@ -502,11 +502,11 @@
+ dnl Set the include directory
+ AC_MSG_CHECKING(for Python header files)
+ if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION
-I$PYEPREFIX/lib/$PYVERSION/config"
++ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION
-I$PYEPREFIX/lib64/$PYVERSION/config"
+ fi
+ if test -z "$PYINCLUDE"; then
+ if test -r $PYPREFIX/include/Py/Python.h; then
+- PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
++ PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib64/python/lib"
+ fi
+ fi
+ AC_MSG_RESULT($PYINCLUDE)
+@@ -515,8 +515,8 @@
+ AC_MSG_CHECKING(for Python library)
+ dirs="$PYVERSION/config $PYVERSION/lib python/lib"
+ for i in $dirs; do
+- if test -d $PYEPREFIX/lib/$i; then
+- PYLIB="-L$PYEPREFIX/lib/$i"
++ if test -d $PYEPREFIX/lib64/$i; then
++ PYLIB="-L$PYEPREFIX/lib64/$i"
+ break
+ fi
+ done
Modified: packages/cooker/cinepaint/current/SPECS/cinepaint.spec
==============================================================================
--- packages/cooker/cinepaint/current/SPECS/cinepaint.spec (original)
+++ packages/cooker/cinepaint/current/SPECS/cinepaint.spec Sun Feb 18
22:46:03 2007
@@ -23,17 +23,21 @@
Patch1: cinepaint-0.21-app_procs.patch
Patch2: cinepaint-0.21-openexr.patch
Patch3: cinepaint-0.21-gutenprint.patch
+Patch4: cinepaint-0.21-python.patch
+Patch5: cinepaint-0.21-python64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildRequires: bison
BuildRequires: desktop-file-utils
BuildRequires: flex
BuildRequires: fltk-devel
-BuildRequires: python-devel
+BuildRequires: python-devel
BuildRequires: libgtk+-devel >= 1.2.8
BuildRequires: libjpeg-devel
BuildRequires: liblcms-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
+BuildRequires: libgimp-devel
+BuildRequires: libxmu-devel
BuildRequires: OpenEXR-devel
BuildRequires: libOpenEXR-devel
BuildRequires: gutenprint-devel >= 5.0.0-0.8mdk
@@ -86,6 +90,10 @@
%patch1 -p1 -b .app_procs
%patch2 -p1 -b .openexr
%patch3 -p1 -b .gutenprint
+%patch4 -p1 -b .python
+%ifarch x86_64
+%patch5 -p1 -b .python64
+%endif
aclocal && autoconf && automake
chmod +x ./mkinstalldirs
@@ -96,8 +104,7 @@
%else
--disable-print
%endif
-
-make
+%make
%install
rm -rf $RPM_BUILD_ROOT
