From 8f94a44c718d63a5733920b156cfb607e1d8f2068b087248aa4f08183727a5a6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 24 Sep 2008 14:43:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=26 --- graphviz-plugins.changes | 5 +++++ graphviz-plugins.spec | 6 +++++- graphviz.spec | 2 +- python-version.diff | 11 +++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 python-version.diff diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 8922949..596b4a3 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 17 10:09:10 CEST 2008 - dmueller@suse.de + +- fix python version detection + ------------------------------------------------------------------- Thu Aug 14 16:51:30 CEST 2008 - ro@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 35f2537..f8acfba 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -30,7 +30,7 @@ BuildRequires: graphviz gtkglext-devel libglade2-devel libgnomeui-devel BuildRequires: fdupes %endif Version: 2.20.2 -Release: 3 +Release: 4 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph @@ -44,6 +44,7 @@ Patch13: graphviz-stddefs.patch Patch100: graphviz-plugins-fix_install_dirs.patch Patch101: graphviz-plugins-tcl_install_dir.patch Patch103: graphviz-2.18-do_not_use_ocamlopt.patch +Patch104: python-version.diff Url: http://www.graphviz.org/ License: IBM Public License Prefix: /usr @@ -365,6 +366,7 @@ Authors: %patch100 %patch101 %patch103 +%patch104 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl # remove broken macros @@ -551,6 +553,8 @@ done %doc __doc/* %changelog +* Wed Sep 17 2008 dmueller@suse.de +- fix python version detection * Thu Aug 14 2008 ro@suse.de - drop get_release_number script - remove release requires in plugins package, require just diff --git a/graphviz.spec b/graphviz.spec index 05295af..676b528 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -25,7 +25,7 @@ BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel PreReq: /bin/rm Version: 2.20.2 -Release: 23 +Release: 41 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph diff --git a/python-version.diff b/python-version.diff new file mode 100644 index 0000000..6efdb28 --- /dev/null +++ b/python-version.diff @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -1001,7 +1001,7 @@ else + if test "x$PYTHON" = "x"; then + use_python="No (python not available)" + else +- PYTHON_VERSION=`$PYTHON -V 2>&1 | $GREP Python | cut -d ' ' -f 2` ++ PYTHON_VERSION=`python -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` + if test "x$PYTHON_VERSION" = "x"; then + PYTHON= + else