From cc971f006ca6379103a420d3fd3fd2a0785b433630d7352469e05709922eeef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Tue, 16 Apr 2019 10:03:32 +0000 Subject: [PATCH] Accepting request 694626 from home:badshah400:branches:graphics - Use %%python3_sitearch macro to package python3 modules. - use correct ruby version (2.5) for openSUSE 15.1 and earlier. OBS-URL: https://build.opensuse.org/request/show/694626 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=138 --- graphviz-addons.changes | 26 ++++++++++++++++++-------- graphviz-addons.spec | 21 +++++++++++++-------- graphviz.changes | 8 +++++++- graphviz.spec | 21 +++++++++++++-------- 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 511da14..e067799 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,13 +1,23 @@ +------------------------------------------------------------------- +Mon Apr 15 18:14:39 UTC 2019 - Atri Bhattacharya + +- Use %%python3_sitearch macro to package python3 modules. +- use correct ruby version (2.5) for openSUSE 15.1 and earlier. + +------------------------------------------------------------------- Tue Apr 2 15:10:04 UTC 2019 - Christian Vögl -- Now using master branch of upstream - - D graphviz-qt5.patch (now in upstream) - - D reproducible.patch (now in upstream) - - M graphviz-smyrna-link_against_glu.patch changed to be applicable to current files - - M graphviz-no_strict_aliasing.patch changed to be applicable to current files - - M graphviz.spec changed %build section to match current build process, removed patches, now useses source archive instead of url - - A _service created service file - +- Now using master branch of upstream, as there have been no releases for + over two years + * this should fix CVE-2019-11023 (boo#1132091) + +- Removed graphviz-qt5.patch (now in upstream) +- Removed reproducible.patch (now in upstream) +- graphviz-smyrna-link_against_glu.patch changed to be applicable to current files +- graphviz-no_strict_aliasing.patch changed to be applicable to current files +- Added graphviz-fix-ruby-version.patch to remove hardcoded dependency on ruby 1.9 +- graphviz.spec updated for new version +- created _service file ------------------------------------------------------------------- Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de diff --git a/graphviz-addons.spec b/graphviz-addons.spec index ee1df13..270c7b0 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,6 +34,13 @@ %else %define php_version 5 %endif + +%if 0%{?suse_version} > 1510 +%define ruby_version 2.6 +%else +%define ruby_version 2.5 +%endif + # No pkgconfig(gts) in sle12 GA or SPx, but in sle15 %if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define sle12 1 @@ -331,12 +338,12 @@ sed -i \ configure.ac %build -./autogen.sh RUBY_VER=2.6 +./autogen.sh RUBY_VER=%{ruby_version} CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" %if %{with extras} -CFLAGS="$CFLAGS -I/usr/include/ruby-2.6.0" +CFLAGS="$CFLAGS -I/usr/include/ruby-%{ruby_version}.0" #seems to be broken? gives -I/usr/lib64/ruby/2.6.0/x86_64-linux-gnu, ruby.h is in /usr/lib64/ruby/2.6.0 #CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo {rb_ver} | sed 's|\.[^.]*$||'))" @@ -356,7 +363,7 @@ export LDFLAGS="-pie" --with-x \ --with-qt \ --with-smyrna \ - RUBY_VER=2.6 \ + RUBY_VER=%{ruby_version} \ %else --without-mylibgd \ --without-libgd \ @@ -564,13 +571,11 @@ fi %{_libdir}/graphviz/python2/_gv.so %{_libdir}/graphviz/python2/gv.py %{_libdir}/graphviz/python2/libgv_python2.so -#is thare a {python_sitearch} for python 3? -%{_libdir}/python3.7/site-packages/_gv.so -%{_libdir}/python3.7/site-packages/gv.py +%{python3_sitearch}/_gv.so +%{python3_sitearch}/gv.py %{_libdir}/graphviz/python3/_gv.so %{_libdir}/graphviz/python3/gv.py %{_libdir}/graphviz/python3/libgv_python3.so - %{_mandir}/man3/gv.3python%{ext_man} %files -n graphviz-ruby diff --git a/graphviz.changes b/graphviz.changes index 54a84fb..e067799 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 15 18:14:39 UTC 2019 - Atri Bhattacharya + +- Use %%python3_sitearch macro to package python3 modules. +- use correct ruby version (2.5) for openSUSE 15.1 and earlier. + +------------------------------------------------------------------- Tue Apr 2 15:10:04 UTC 2019 - Christian Vögl - Now using master branch of upstream, as there have been no releases for @@ -11,7 +18,6 @@ Tue Apr 2 15:10:04 UTC 2019 - Christian Vögl - Added graphviz-fix-ruby-version.patch to remove hardcoded dependency on ruby 1.9 - graphviz.spec updated for new version - created _service file - ------------------------------------------------------------------- Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de diff --git a/graphviz.spec b/graphviz.spec index 78d7495..0973df5 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,6 +34,13 @@ %else %define php_version 5 %endif + +%if 0%{?suse_version} > 1510 +%define ruby_version 2.6 +%else +%define ruby_version 2.5 +%endif + # No pkgconfig(gts) in sle12 GA or SPx, but in sle15 %if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define sle12 1 @@ -331,12 +338,12 @@ sed -i \ configure.ac %build -./autogen.sh RUBY_VER=2.6 +./autogen.sh RUBY_VER=%{ruby_version} CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" %if %{with extras} -CFLAGS="$CFLAGS -I/usr/include/ruby-2.6.0" +CFLAGS="$CFLAGS -I/usr/include/ruby-%{ruby_version}.0" #seems to be broken? gives -I/usr/lib64/ruby/2.6.0/x86_64-linux-gnu, ruby.h is in /usr/lib64/ruby/2.6.0 #CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo {rb_ver} | sed 's|\.[^.]*$||'))" @@ -356,7 +363,7 @@ export LDFLAGS="-pie" --with-x \ --with-qt \ --with-smyrna \ - RUBY_VER=2.6 \ + RUBY_VER=%{ruby_version} \ %else --without-mylibgd \ --without-libgd \ @@ -564,13 +571,11 @@ fi %{_libdir}/graphviz/python2/_gv.so %{_libdir}/graphviz/python2/gv.py %{_libdir}/graphviz/python2/libgv_python2.so -#is thare a {python_sitearch} for python 3? -%{_libdir}/python3.7/site-packages/_gv.so -%{_libdir}/python3.7/site-packages/gv.py +%{python3_sitearch}/_gv.so +%{python3_sitearch}/gv.py %{_libdir}/graphviz/python3/_gv.so %{_libdir}/graphviz/python3/gv.py %{_libdir}/graphviz/python3/libgv_python3.so - %{_mandir}/man3/gv.3python%{ext_man} %files -n graphviz-ruby