Rename python2 subpackage to graphviz-python2

In 1b33b027fa?branch=master
the python2 subpackage was renamed from graphviz-python to
python2-graphviz. It turns out that there's a separate python-graphviz
project, so the names conflict. Let's rename the graphviz subpackage
back to graphviz-python2. Other packages already depend on the python2-graphviz
name. They will have to be adjusted to use something different.
Provides: python2dist(gv) is added to graphviz-python2 to make it
easier for packages which need this module despite the name changes.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-04-14 12:37:10 +02:00
parent a4be7ecd35
commit fac5862484
1 changed files with 16 additions and 8 deletions

View File

@ -49,7 +49,7 @@
Name: graphviz
Summary: Graph Visualization Tools
Version: 2.40.1
Release: 21%{?dist}
Release: 22%{?dist}
Group: Applications/Multimedia
License: EPL
URL: http://www.graphviz.org/
@ -211,17 +211,20 @@ Requires: php(api) = %{php_core_api}
PHP extension for graphviz.
%endif
%package -n python2-graphviz
%{?python_provide:%python_provide python2-graphviz}
%package python2
Group: Applications/Multimedia
Summary: Python extension for graphviz
Requires: %{name} = %{version}-%{release}
# Manually add provides that would be generated automatically if .egg-info was present
Provides: python2dist(gv) = %{version}
Provides: python%{python2_version}dist(gv) = %{version}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Group: Applications/Multimedia
Summary: Python extension for graphviz
Requires: %{name} = %{version}-%{release}, python2
Obsoletes: python2-%{name} < %{version}-%{release}
%description -n python2-graphviz
%description python2
Python extension for graphviz.
%if %{ARRRR}
@ -520,7 +523,7 @@ php --no-php-ini \
%{_mandir}/man3/gv.3php*
%endif
%files -n python2-graphviz
%files python2
%defattr(-,root,root,-)
%{_libdir}/graphviz/python/
%{_libdir}/python*/*
@ -555,6 +558,11 @@ php --no-php-ini \
%{_mandir}/man3/*.3tcl*
%changelog
* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.40.1-22
- Rename python2 subpackage to graphviz-python2, because
there is intent to package python-graphviz, which is a separate project
from graphviz.
* Thu Mar 8 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-21
- Dropped libgnomeui-devel requirement, libgnomeui support has been
dropped long time ago in upstream