From df3d7808042b7a401fef7af29b62fafdb30a486f7112cabdfbb695085457595c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Mon, 16 Mar 2020 09:54:57 +0000 Subject: [PATCH 1/3] Accepting request 784223 from home:scarabeus_iv:branches:graphics - Add python2/python3 split subpkgs in order to allow building without python2 available OBS-URL: https://build.opensuse.org/request/show/784223 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=148 --- graphviz-addons.changes | 6 ++++++ graphviz-addons.spec | 35 ++++++++++++++++++++++++++--------- graphviz.spec | 4 ++-- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 172edc6..0108847 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 12 09:07:17 UTC 2020 - Tomáš Chvátal + +- Add python2/python3 split subpkgs in order to allow building + without python2 available + ------------------------------------------------------------------- Mon Jan 13 11:59:55 UTC 2020 - Christian Vögl diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 31d5d8b..65b6a02 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -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-graphviz 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-graphviz +The package contains the Python extension for the +graphviz tools. + +%package -n python3-graphviz +Summary: Python 3 Extension for Graphviz +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Provides: graphviz-python +Obsoletes: graphviz-python + +%description -n python3-graphviz +The package contains the Python extension for the graphviz tools. %package -n graphviz-ruby @@ -558,14 +571,18 @@ fi %{_datadir}/php%{php_version}/gv.php %{_mandir}/man3/gv.3php%{ext_man} -%files -n graphviz-python +%if %{with python2} +%files -n python2-graphviz %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-graphviz +%dir %{_libdir}/graphviz/python3 %{python3_sitearch}/_gv.so %{python3_sitearch}/gv.py %{_libdir}/graphviz/python3/_gv.so diff --git a/graphviz.spec b/graphviz.spec index 3a820cb..2300d62 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -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 From a8735bcf38b7a7c7ba582a9cb04aa69c1f50a5649fc6e460dd5408f977b2b4d3 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 30 Mar 2020 15:31:14 +0000 Subject: [PATCH 2/3] Accepting request 789151 from home:scarabeus_iv:branches:graphics - Add also configure option to not build py2 if the python2 build is disabled - Auto-identify the correct ruby-version using pkg-config. - Add also configure option to not build py2 if the python2 build is disabled - Add python2/python3 split subpkgs in order to allow building without python2 available OBS-URL: https://build.opensuse.org/request/show/789151 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=149 --- graphviz-addons.changes | 11 +++++++++++ graphviz-addons.spec | 6 ++++++ graphviz.changes | 12 ++++++++++++ 3 files changed, 29 insertions(+) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 0108847..18954f0 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,9 +1,20 @@ +------------------------------------------------------------------- +Fri Mar 27 20:28:30 UTC 2020 - Tomáš Chvátal + +- 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 - Add python2/python3 split subpkgs in order to allow building without python2 available +------------------------------------------------------------------- +Thu Mar 5 12:03:06 UTC 2020 - Dominique Leuenberger + +- Auto-identify the correct ruby-version using pkg-config. + ------------------------------------------------------------------- Mon Jan 13 11:59:55 UTC 2020 - Christian Vögl diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 65b6a02..7775180 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -369,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 \ diff --git a/graphviz.changes b/graphviz.changes index 5b7c64d..18954f0 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Mar 27 20:28:30 UTC 2020 - Tomáš Chvátal + +- 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 + +- Add python2/python3 split subpkgs in order to allow building + without python2 available + ------------------------------------------------------------------- Thu Mar 5 12:03:06 UTC 2020 - Dominique Leuenberger From 75252b4493f3cd36e54f6e37052b12b3953380b4d994252c661153d632b8b00f Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 1 Apr 2020 08:28:38 +0000 Subject: [PATCH 3/3] Accepting request 790158 from home:scarabeus_iv:branches:graphics - Rename python*-graphviz to python*-gv, there is also normal pypi graphviz package and we clash otherwise and override each other OBS-URL: https://build.opensuse.org/request/show/790158 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=150 --- graphviz-addons.changes | 7 +++++++ graphviz-addons.spec | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 18954f0..1d3ac25 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 31 13:07:32 UTC 2020 - Tomáš Chvátal + +- 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 diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 7775180..b8b4d15 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -239,23 +239,23 @@ Requires: php%{php_version} The graphviz-php package contains the PHP extension for the graphviz tools. -%package -n python2-graphviz +%package -n python2-gv Summary: Python Extension for Graphviz Group: Productivity/Graphics/Visualization/Graph Requires: graphviz = %{version} -%description -n python2-graphviz +%description -n python2-gv The package contains the Python extension for the graphviz tools. -%package -n python3-graphviz +%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-graphviz +%description -n python3-gv The package contains the Python extension for the graphviz tools. @@ -578,7 +578,7 @@ fi %{_mandir}/man3/gv.3php%{ext_man} %if %{with python2} -%files -n python2-graphviz +%files -n python2-gv %dir %{_libdir}/graphviz/python2 %{python_sitearch}/_gv.so %{python_sitearch}/gv.py @@ -587,7 +587,7 @@ fi %{_libdir}/graphviz/python2/libgv_python2.so %endif -%files -n python3-graphviz +%files -n python3-gv %dir %{_libdir}/graphviz/python3 %{python3_sitearch}/_gv.so %{python3_sitearch}/gv.py