diff --git a/graphviz-gvedit.changes b/graphviz-gvedit.changes index 7d29a9b..5dda77b 100644 --- a/graphviz-gvedit.changes +++ b/graphviz-gvedit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + ------------------------------------------------------------------- Wed Sep 11 13:42:43 CEST 2013 - pth@suse.de diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec index 1c1a219..036f128 100644 --- a/graphviz-gvedit.spec +++ b/graphviz-gvedit.spec @@ -30,6 +30,7 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +Patch4: graphviz-python3_version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -66,6 +67,7 @@ package. %setup -q -n %{mname}-%{version} %patch2 %patch3 +%patch4 -p1 # 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 diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 0fbd1ca..7d7c544 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + ------------------------------------------------------------------- Mon Sep 9 13:45:47 CEST 2013 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 313080e..31cc9ee 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -98,6 +98,8 @@ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version} Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +#PATCH-FIX-UPSTREAM print can only be called as function in python3 +Patch4: graphviz-python3_version.patch #Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -271,6 +273,7 @@ Provides some additional PDF and HTML documentation for graphviz. %setup -q -n %{mname}-%{version} %patch2 %patch3 +%patch4 -p1 %patch100 %patch102 %patch103 diff --git a/graphviz-python3_version.patch b/graphviz-python3_version.patch new file mode 100644 index 0000000..d398459 --- /dev/null +++ b/graphviz-python3_version.patch @@ -0,0 +1,19 @@ +Bracketing sys.version_info is wrong and print is only a function im python 3. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: graphviz-2.34.0/configure.ac +=================================================================== +--- graphviz-2.34.0.orig/configure.ac 2013-09-07 03:07:52.000000000 +0200 ++++ graphviz-2.34.0/configure.ac 2013-09-12 16:25:48.006562980 +0200 +@@ -1143,7 +1143,7 @@ else + if test "x$PYTHON" = "x"; then + use_python="No (python not available)" + else +- PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"` ++ PYTHON_VERSION=`$PYTHON -c "import sys; print('%d.%d' % sys.version_info[[0:2]])"` + if test "x$PYTHON_VERSION" = "x"; then + PYTHON= + else diff --git a/graphviz.changes b/graphviz.changes index 3033a63..07cf824 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + ------------------------------------------------------------------- Wed Sep 11 18:55:22 CEST 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 0f580bb..1c7b4f7 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -31,6 +31,8 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +#PATCH-FIX-UPSTREAM print can only be called as function in python3 +Patch4: graphviz-python3_version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -91,6 +93,7 @@ Note: If you need output in png format you also need to install %setup -q %patch2 %patch3 +%patch4 -p1 # 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 @@ -175,7 +178,45 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %files %defattr(-,root,root) %doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog -%attr(755,root,root) %{_bindir}/* +#%%attr(755,root,root) %{_bindir}/* +%{_bindir}/acyclic +%{_bindir}/bcomps +%{_bindir}/ccomps +%{_bindir}/circo +%{_bindir}/cluster +%{_bindir}/dijkstra +%{_bindir}/dot +%{_bindir}/dot2gxl +%{_bindir}/dot_builtins +%{_bindir}/dotty +%{_bindir}/fdp +%{_bindir}/gc +%{_bindir}/gml2gv +%{_bindir}/graphml2gv +%{_bindir}/gv2gml +%{_bindir}/gv2gxl +%{_bindir}/gvcolor +%{_bindir}/gvedit +%{_bindir}/gvgen +%{_bindir}/gvmap +%{_bindir}/gvmap.sh +%{_bindir}/gvpack +%{_bindir}/gvpr +%{_bindir}/gxl2dot +%{_bindir}/gxl2gv +%{_bindir}/lefty +%{_bindir}/lneato +%{_bindir}/mm2gv +%{_bindir}/neato +%{_bindir}/nop +%{_bindir}/osage +%{_bindir}/patchwork +%{_bindir}/prune +%{_bindir}/sccmap +%{_bindir}/sfdp +%{_bindir}/tred +%{_bindir}/twopi +%{_bindir}/unflatten %dir %{_datadir}/%{name} %{_datadir}/%{name}/lefty %{_datadir}/%{name}/graphs @@ -218,7 +259,7 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %dir %{_libdir}/%{name} %{_libdir}/*.so.* %{_libdir}/graphviz/*.so* -%{_sysconfdir}/ld.so.conf.d/graphviz.conf +%config %{_sysconfdir}/ld.so.conf.d/graphviz.conf %ghost %{_libdir}/graphviz/config %files devel