Accepting request 159738 from graphics

- add build conditionals for java, ocaml and mono (needed for
  aarch64 port for now)
- add aarch64-lib64-support.diff:
  add aarch64 to the list of lib64 architectures

- add aarch64-lib64-support.diff:
  * add aarch64 to the list of lib64 architectures (forwarded request 159670 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/159738
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=56

aarch64-lib64-support.diff

@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -100,7 +100,7 @@
+ case "${host_os}" in
+   *linux* )
+     case "${host_cpu}" in
+-      powerpc64 | s390x | x86_64 | sparc64 )
++      aarch64 | powerpc64 | s390x | x86_64 | sparc64 )
+         LIBPOSTFIX="64"
+         ;;
+     esac

graphviz-plugins.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Mar 16 22:27:10 UTC 2013 - dmueller@suse.com
+
+- add build conditionals for java, ocaml and mono (needed for
+  aarch64 port for now)
+- add aarch64-lib64-support.diff:
+  add aarch64 to the list of lib64 architectures
+
+-------------------------------------------------------------------
+Mon Sep  3 12:11:26 CEST 2012 - pth@suse.de
+
+- Reinstate the dependency on gtkglext-devel but guarded by an
+  'if suse_version > 1220'.
+
 -------------------------------------------------------------------
 Mon Sep  3 09:18:31 UTC 2012 - idonmez@suse.com
 

graphviz-plugins.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz-plugins
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,20 @@
 
 %define mname graphviz
 
+%ifarch aarch64
+%bcond_with    graphviz_java
+%bcond_with    graphviz_ocaml
+%else
+%bcond_without graphviz_java
+%bcond_without graphviz_ocaml
+%endif
+%bcond_without mono
+
 Name:           graphviz-plugins
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  freetype2-devel >= 2
 BuildRequires:  gcc-c++
-BuildRequires:  gcc-java
 BuildRequires:  gd-devel
 BuildRequires:  ghostscript
 BuildRequires:  gmp-devel
@@ -31,14 +39,26 @@ BuildRequires:  graphviz
 BuildRequires:  guile-devel
 BuildRequires:  ksh
 BuildRequires:  libexpat-devel
-BuildRequires:  libgcj-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  m4
+%ifnarch aarch64
+%if 0%suse_version > 1220
+BuildRequires:  gtkglext-devel
+%endif
+%endif
+%if %{with graphviz_java}
+BuildRequires:  gcc-java
+BuildRequires:  libgcj-devel
+%endif
+%if %{with mono}
 BuildRequires:  mono-core
+%endif
+%if %{with graphviz_ocaml}
 BuildRequires:  ocaml
+%endif
 BuildRequires:  perl
 BuildRequires:  php5-devel
 BuildRequires:  python-devel
@@ -71,6 +91,7 @@ Group:          Productivity/Graphics/Visualization/Graph
 Url:            http://www.graphviz.org/
 Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
 Patch1:         graphviz-gd_png_check_sig.patch
+Patch4:         aarch64-lib64-support.diff
 Patch100:       graphviz-plugins-fix_install_dirs.patch
 Patch101:       graphviz-python_version.patch
 Patch102:       graphviz-plugins-tcl_install_dir.patch
@@ -125,6 +146,7 @@ Provides:       graphviz_plugin = %{version}
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
 
+%if %{with graphviz_java}
 %package -n graphviz-java
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -135,6 +157,7 @@ Provides:       graphviz_plugin = %{version}
 %description -n graphviz-java
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in bar charts).
+%endif
 
 %package -n graphviz-lua
 Summary:        Lua extension for graphviz
@@ -147,6 +170,7 @@ Provides:       graphviz_plugin = %{version}
 The graphviz-lua package contains the lua extension for the graphviz
 tools.
 
+%if %{with graphviz_ocaml}
 %package -n graphviz-ocaml
 Summary:        OCAML extension for graphviz
 Group:          Productivity/Graphics/Visualization/Graph
@@ -157,6 +181,7 @@ Provides:       graphviz_plugin = %{version}
 %description -n graphviz-ocaml
 The graphviz-ocaml package contains the Objective Caml extension for
 the graphviz tools.
+%endif
 
 %package -n graphviz-perl
 Summary:        Perl extension for Graphviz
@@ -202,6 +227,7 @@ Provides:       graphviz_plugin = %{version}
 The graphviz-ruby package contains the ruby extension for the graphviz
 tools.
 
+%if %{with mono}
 %package -n graphviz-sharp
 Summary:        C# Extension for Graphviz
 Group:          Productivity/Graphics/Visualization/Graph
@@ -212,6 +238,7 @@ Provides:       graphviz_plugin = %{version}
 %description -n graphviz-sharp
 The graphviz-sharp package contains the C# extension for the graphviz
 tools.
+%endif
 
 %package -n graphviz-tcl
 Summary:        Tcl extension tools for graphviz
@@ -235,6 +262,7 @@ Provides some additional PDF and HTML documentation for graphviz.
 %prep
 %setup -q -n %{mname}-%{version}
 %patch1 
+%patch4
 %patch100
 %patch101
 %patch102
@@ -346,14 +374,18 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 %{_libdir}/graphviz/guile
 %doc %{_mandir}/man3/gv.3guile.gz
 
+%if %{with graphviz_java}
 %files -n graphviz-java
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/java
+%endif
 
+%if %{with mono}
 %files -n graphviz-sharp
 %defattr(-,root,root)
 %{_libdir}/graphviz/sharp
 %doc %{_mandir}/man3/gv.3sharp.gz
+%endif
 
 %files -n graphviz-lua
 %defattr(-,root,root,-)
@@ -364,10 +396,12 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 %{lua_libdir}/gv.so
 %doc %{_mandir}/man3/gv.3lua.gz
 
+%if %{with graphviz_ocaml}
 %files -n graphviz-ocaml
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ocaml
 %doc %{_mandir}/man3/gv.3ocaml.gz
+%endif
 
 %files -n graphviz-perl
 %defattr(-,root,root,-)

graphviz.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Mar 16 22:26:37 UTC 2013 - dmueller@suse.com
+
+- add aarch64-lib64-support.diff:
+  * add aarch64 to the list of lib64 architectures 
+
+-------------------------------------------------------------------
+Wed Jan 16 18:02:58 CET 2013 - pth@suse.de
+
+- Add BuildRequires for libXaw which isn't pulled in by x11 anymore
+  (bnc#797258).
+
 -------------------------------------------------------------------
 Mon Jun 25 14:32:50 UTC 2012 - coolo@suse.com
 

graphviz.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,11 +31,13 @@ Source2:        graphviz-rpmlintrc
 Patch1:         graphviz-gd_png_check_sig.patch
 Patch2:         graphviz-fix-pkgIndex.patch
 Patch3:         graphviz-missing_headers.patch
+Patch4:         aarch64-lib64-support.diff
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  freetype2-devel >= 2
 BuildRequires:  gcc-c++
+BuildRequires:  libXaw-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
@@ -87,6 +89,7 @@ Note: If you need output in png format you also need to install
 %patch1
 %patch2
 %patch3 -p1
+%patch4
 
 # 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