rpm/graphviz
SHA256
1
0
Fork 0
forked from pool/graphviz
Code Pull Requests Activity

Accepting request 694626 from home:badshah400:branches:graphics

Browse Source 
- 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
This commit is contained in:
Christian Vögl 2019-04-16 10:03:32 +00:00 committed by Git OBS Bridge
parent 96143b7b0b
commit cc971f006c
4 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
graphviz-addons.changes
View File

@ -1,13 +1,23 @@
-------------------------------------------------------------------
Mon Apr 15 18:14:39 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
- 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 <christian.voegl@suse.com> Tue Apr 2 15:10:04 UTC 2019 - Christian Vögl <christian.voegl@suse.com>
- Now using master branch of upstream - Now using master branch of upstream, as there have been no releases for
- D graphviz-qt5.patch (now in upstream) over two years
- D reproducible.patch (now in upstream) * this should fix CVE-2019-11023 (boo#1132091)
- 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 - Removed graphviz-qt5.patch (now in upstream)
- M graphviz.spec changed %build section to match current build process, removed patches, now useses source archive instead of url - Removed reproducible.patch (now in upstream)
- A _service created service file - 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 Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de

21
graphviz-addons.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 %else
%define php_version 5 %define php_version 5
%endif %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 # No pkgconfig(gts) in sle12 GA or SPx, but in sle15
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
%define sle12 1 %define sle12 1
@ -331,12 +338,12 @@ sed -i \
configure.ac configure.ac
%build %build
./autogen.sh RUBY_VER=2.6 ./autogen.sh RUBY_VER=%{ruby_version}
CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC"
%if %{with extras} %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 #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|\.[^.]*$||'))" #CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo {rb_ver} | sed 's|\.[^.]*$||'))"
@ -356,7 +363,7 @@ export LDFLAGS="-pie"
--with-x \ --with-x \
--with-qt \ --with-qt \
--with-smyrna \ --with-smyrna \
RUBY_VER=2.6 \ RUBY_VER=%{ruby_version} \
%else %else
--without-mylibgd \ --without-mylibgd \
--without-libgd \ --without-libgd \
@ -564,13 +571,11 @@ fi
%{_libdir}/graphviz/python2/_gv.so %{_libdir}/graphviz/python2/_gv.so
%{_libdir}/graphviz/python2/gv.py %{_libdir}/graphviz/python2/gv.py
%{_libdir}/graphviz/python2/libgv_python2.so %{_libdir}/graphviz/python2/libgv_python2.so
#is thare a {python_sitearch} for python 3? %{python3_sitearch}/_gv.so
%{_libdir}/python3.7/site-packages/_gv.so %{python3_sitearch}/gv.py
%{_libdir}/python3.7/site-packages/gv.py
%{_libdir}/graphviz/python3/_gv.so %{_libdir}/graphviz/python3/_gv.so
%{_libdir}/graphviz/python3/gv.py %{_libdir}/graphviz/python3/gv.py
%{_libdir}/graphviz/python3/libgv_python3.so %{_libdir}/graphviz/python3/libgv_python3.so
%{_mandir}/man3/gv.3python%{ext_man} %{_mandir}/man3/gv.3python%{ext_man}
%files -n graphviz-ruby %files -n graphviz-ruby

8
graphviz.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 15 18:14:39 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
- 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 <christian.voegl@suse.com> Tue Apr 2 15:10:04 UTC 2019 - Christian Vögl <christian.voegl@suse.com>
- Now using master branch of upstream, as there have been no releases for - 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 <christian.voegl@suse.com>
- Added graphviz-fix-ruby-version.patch to remove hardcoded dependency on ruby 1.9 - Added graphviz-fix-ruby-version.patch to remove hardcoded dependency on ruby 1.9
- graphviz.spec updated for new version - graphviz.spec updated for new version
- created _service file - created _service file
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de

21
graphviz.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 %else
%define php_version 5 %define php_version 5
%endif %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 # No pkgconfig(gts) in sle12 GA or SPx, but in sle15
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
%define sle12 1 %define sle12 1
@ -331,12 +338,12 @@ sed -i \
configure.ac configure.ac
%build %build
./autogen.sh RUBY_VER=2.6 ./autogen.sh RUBY_VER=%{ruby_version}
CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC"
%if %{with extras} %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 #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|\.[^.]*$||'))" #CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo {rb_ver} | sed 's|\.[^.]*$||'))"
@ -356,7 +363,7 @@ export LDFLAGS="-pie"
--with-x \ --with-x \
--with-qt \ --with-qt \
--with-smyrna \ --with-smyrna \
RUBY_VER=2.6 \ RUBY_VER=%{ruby_version} \
%else %else
--without-mylibgd \ --without-mylibgd \
--without-libgd \ --without-libgd \
@ -564,13 +571,11 @@ fi
%{_libdir}/graphviz/python2/_gv.so %{_libdir}/graphviz/python2/_gv.so
%{_libdir}/graphviz/python2/gv.py %{_libdir}/graphviz/python2/gv.py
%{_libdir}/graphviz/python2/libgv_python2.so %{_libdir}/graphviz/python2/libgv_python2.so
#is thare a {python_sitearch} for python 3? %{python3_sitearch}/_gv.so
%{_libdir}/python3.7/site-packages/_gv.so %{python3_sitearch}/gv.py
%{_libdir}/python3.7/site-packages/gv.py
%{_libdir}/graphviz/python3/_gv.so %{_libdir}/graphviz/python3/_gv.so
%{_libdir}/graphviz/python3/gv.py %{_libdir}/graphviz/python3/gv.py
%{_libdir}/graphviz/python3/libgv_python3.so %{_libdir}/graphviz/python3/libgv_python3.so
%{_mandir}/man3/gv.3python%{ext_man} %{_mandir}/man3/gv.3python%{ext_man}
%files -n graphviz-ruby %files -n graphviz-ruby