Dominique Leuenberger 2020-04-05 18:51:14 +00:00 committed by Git OBS Bridge
commit 8ec0531750
4 changed files with 70 additions and 11 deletions

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Tue Mar 31 13:07:32 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Rename python*-graphviz to python*-gv, there is also normal
pypi graphviz package and we clash otherwise and override
each other
-------------------------------------------------------------------
Fri Mar 27 20:28:30 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Add also configure option to not build py2 if the python2
build is disabled
-------------------------------------------------------------------
Thu Mar 12 09:07:17 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Add python2/python3 split subpkgs in order to allow building
without python2 available
-------------------------------------------------------------------
Thu Mar 5 12:03:06 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Auto-identify the correct ruby-version using pkg-config.
-------------------------------------------------------------------
Mon Jan 13 11:59:55 UTC 2020 - Christian Vögl <cvoegl@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package graphviz-addons
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,13 +43,14 @@
%else
%define sle12 0
%endif
%bcond_without python2
Name: graphviz-addons
Version: 2.42.3
Release: 0
Summary: Graph Visualization Tools
License: EPL-1.0
Group: Productivity/Graphics/Visualization/Graph
Url: http://www.graphviz.org/
URL: http://www.graphviz.org/
Source: https://www2.graphviz.org/Packages/stable/portable_source/graphviz-%{version}.tar.gz
Source2: graphviz-rpmlintrc
#PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
@ -87,7 +88,6 @@ BuildRequires: freeglut-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: perl
BuildRequires: python3-devel
%if 0%{?suse_version} >= 1500
BuildRequires: php7-devel
BuildRequires: swig >= 3.0.11
@ -112,7 +112,10 @@ BuildRequires: pkgconfig(libglade-2.0)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(pango)
%if %{with python2}
BuildRequires: pkgconfig(python)
%endif
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(tcl)
BuildRequires: pkgconfig(x11)
@ -236,14 +239,24 @@ Requires: php%{php_version}
The graphviz-php package contains the PHP extension for the graphviz
tools.
%package -n graphviz-python
%package -n python2-gv
Summary: Python Extension for Graphviz
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Requires: python
%description -n graphviz-python
The graphviz-python package contains the Python extension for the
%description -n python2-gv
The package contains the Python extension for the
graphviz tools.
%package -n python3-gv
Summary: Python 3 Extension for Graphviz
Group: Productivity/Graphics/Visualization/Graph
Requires: graphviz = %{version}
Provides: graphviz-python
Obsoletes: graphviz-python
%description -n python3-gv
The package contains the Python extension for the
graphviz tools.
%package -n graphviz-ruby
@ -356,6 +369,12 @@ export LDFLAGS="-pie"
--disable-io \
--without-visio \
%if %{with extras}
%if %{with python2}
--enable-python2 \
%else
--disable-python \
--disable-python2 \
%endif
--with-x \
--with-qt \
--with-smyrna \
@ -558,14 +577,18 @@ fi
%{_datadir}/php%{php_version}/gv.php
%{_mandir}/man3/gv.3php%{ext_man}
%files -n graphviz-python
%if %{with python2}
%files -n python2-gv
%dir %{_libdir}/graphviz/python2
%dir %{_libdir}/graphviz/python3
%{python_sitearch}/_gv.so
%{python_sitearch}/gv.py
%{_libdir}/graphviz/python2/_gv.so
%{_libdir}/graphviz/python2/gv.py
%{_libdir}/graphviz/python2/libgv_python2.so
%endif
%files -n python3-gv
%dir %{_libdir}/graphviz/python3
%{python3_sitearch}/_gv.so
%{python3_sitearch}/gv.py
%{_libdir}/graphviz/python3/_gv.so

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Mar 27 20:28:30 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Add also configure option to not build py2 if the python2
build is disabled
-------------------------------------------------------------------
Thu Mar 12 09:07:17 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Add python2/python3 split subpkgs in order to allow building
without python2 available
-------------------------------------------------------------------
Thu Mar 5 12:03:06 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
#
# spec file for package graphviz
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -49,7 +49,7 @@ Release: 0
Summary: Graph Visualization Tools
License: EPL-1.0
Group: Productivity/Graphics/Visualization/Graph
Url: http://www.graphviz.org/
URL: http://www.graphviz.org/
Source: https://www2.graphviz.org/Packages/stable/portable_source/graphviz-%{version}.tar.gz
Source2: graphviz-rpmlintrc
#PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL