- removed check for gnome canvas module which requires X environment

  running; the module is installed due to python-gnome-devel dependency so
  the check is not necessary at all
- rel. 2

Changed files:
    diacanvas-no_check.patch -> 1.1
    diacanvas.spec -> 1.20

diff --git a/diacanvas-no_check.patch b/diacanvas-no_check.patch
new file mode 100644 (file)
index 0000000..5f5d8b6
--- /dev/null
+++ b/diacanvas-no_check.patch
@@ -0,0 +1,29 @@
+diff -Nur diacanvas2-0.10.0.orig/configure.in diacanvas2-0.10.0/configure.in
+--- diacanvas2-0.10.0.orig/configure.in        2003-10-14 08:50:04.000000000 +0200
++++ diacanvas2-0.10.0/configure.in     2003-11-04 13:46:10.000000000 +0100
+@@ -247,25 +247,6 @@
+ AC_SUBST(PYGTK_DEFSDIR)
+ AC_MSG_RESULT($PYGTK_DEFSDIR)
+ 
+-AC_MSG_CHECKING(for gnome-python (for GnomeCanvas))
+-prog="
+-import sys
+-import imp
+-try:
+-      import pygtk
+-      pygtk.require('2.0')
+-      #imp.find_module('gnome/canvas')
+-      import gnome.canvas
+-except ImportError:
+-      sys.exit(1)
+-sys.exit(0)"
+-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then
+-    AC_MSG_RESULT(yes)
+-else
+-    AC_MSG_RESULT(no)
+-    enable_python=no
+-fi
+-
+ fi # enable_python
+ 
+ AM_CONDITIONAL(ENABLE_PYTHON, test "x$enable_python" = "xyes")

diff --git a/diacanvas.spec b/diacanvas.spec
index ac09dc8febcc00cefbf33f126e7aa07e69ac35de..d082d1c8e6c9c39b490daf5ed262c9a68cffd5e2 100644 (file)
--- a/diacanvas.spec
+++ b/diacanvas.spec
@@ -12,6 +12,7 @@ License:      GPL
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/sourceforge/%{name}/%{src_name}-%{version}.tar.gz
 # Source0-md5: 26087d205ad833341fcfab047d70837f
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/sourceforge/%{name}/%{src_name}-%{version}.tar.gz
 # Source0-md5: 26087d205ad833341fcfab047d70837f

+Patch0:                %{name}-no_check.patch

 URL:           http://diacanvas.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://diacanvas.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -79,6 +80,7 @@ Pliki dla programist
 
 %prep
 %setup -q -n %{src_name}-%{version}
 
 %prep
 %setup -q -n %{src_name}-%{version}

+%patch0 -p1

 
 %build
 rm -f missing
 
 %build
 rm -f missing