packages/graphviz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove graphviz-python2 subpackage

Browse Source
This commit is contained in:
jinzhimin369 2020-10-29 16:40:38 +08:00
parent 4e4d758bf4
commit 30344a779f
1 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
graphviz.spec
View File

@ -1,4 +1,3 @@
%bcond_with python2
%bcond_with php
%if "%{php_version}" < "5.6"
@ -16,7 +15,7 @@
Name: graphviz
Version: 2.44.1
Release: 1
Release: 2
Summary: Graph Visualization Tools
License: EPL
URL: http://www.graphviz.org/
@ -27,10 +26,6 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel tk-devel f
BuildRequires: python3-devel libXaw-devel libSM-devel libXext-devel java-devel pango-devel gmp-devel lua-devel gtk2-devel cairo-devel >= 1.1.10
BuildRequires: ghostscript libgs-devel gd-devel perl-devel
%if %{with python2}
BuildRequires: python2-devel
%endif
%if %{with php}
BuildRequires: php-devel
%endif
@ -116,19 +111,6 @@ Requires: %{name} = %{version}-%{release} php-common php
PHP extension for graphviz.
%endif
%if %{with python2}
%package python2
Summary: Python extension for graphviz
Requires: %{name} = %{version}-%{release}
Provides: python2dist(gv) = %{version} python%{python2_version}dist(gv) = %{version}
Provides: %{name}-python = %{version}-%{release} %{name}-python% = %{version}-%{release}
Obsoletes: %{name}-python < 2.40.1-25 python2-%{name} < 2.40.1-25
%description python2
Python extension for graphviz.
%endif
%package python3
Summary: Python 3 extension for graphviz
Requires: %{name} = %{version}-%{release}
@ -157,25 +139,11 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon
--with-gdk-pixbuf --with-visio --disable-silent-rules \
--without-lasi --without-gts --disable-sharp --without-ming \
--disable-r --without-devil --without-qt
%if %{with python2}
cp -a tclpkg/gv tclpkg/gv.python2
%endif
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
PYTHON_INCLUDES=`python3-config --includes` PYTHON_LIBS=`python3-config --libs` \
PYTHON_INSTALL_DIR=%{python3_sitearch} PYTHON=%{__python3}
%if %{with python2}
cd tclpkg/gv.python2
%make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
PYTHON_INCLUDES=-I/usr/include/python%{python2_version} PYTHON_LIBS="-lpython%{python2_version}" \
PYTHON_INSTALL_DIR=%{python2_sitearch} libgv_python.la
%endif
%install
@ -201,16 +169,9 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name}/demo -type f -exec chmod a-x {} ';'
chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
%if %{with python2}
pushd tclpkg/gv.python2
install -pD .libs/libgv_python.so $RPM_BUILD_ROOT%{python2_sitearch}/_gv.so
install -p gv.py $RPM_BUILD_ROOT%{python2_sitearch}/gv.py
popd
%endif
# python 3
pushd tclpkg/gv
install -pD .libs/libgv_python.so $RPM_BUILD_ROOT%{python3_sitearch}/_gv.so
install -pD .libs/libgv_python3.so $RPM_BUILD_ROOT%{python3_sitearch}/_gv.so
install -p gv.py $RPM_BUILD_ROOT%{python3_sitearch}/gv.py
popd
@ -291,12 +252,6 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/
%{_libdir}/graphviz/perl/
%{_libdir}/perl*/*
%if %{with python2}
%files python2
%{python2_sitearch}/*
%{_libdir}/graphviz/python2/*
%endif
%files python3
%{python3_sitearch}/*
%{_libdir}/graphviz/python3/*
@ -312,6 +267,9 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/
%changelog
* Wed Oct 21 2020 jinzhimin<jinzhimin2@huawei.com> - 2.44.1-2
- remove graphviz-python2 subpackage
* Fri Jul 24 2020 hanhui <hanhui15@huawei.com> - 2.44.1-1
- update to 2.44.1