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:
parent
4cf6bb136b
commit
268f36e388
|
@ -49,7 +49,7 @@
|
||||||
Name: graphviz
|
Name: graphviz
|
||||||
Summary: Graph Visualization Tools
|
Summary: Graph Visualization Tools
|
||||||
Version: 2.40.1
|
Version: 2.40.1
|
||||||
Release: 21%{?dist}
|
Release: 22%{?dist}
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
License: EPL
|
License: EPL
|
||||||
URL: http://www.graphviz.org/
|
URL: http://www.graphviz.org/
|
||||||
|
@ -212,17 +212,20 @@ Requires: php(api) = %{?php_core_api}%{?!php_core_api:UNDEFINED}
|
||||||
PHP extension for graphviz.
|
PHP extension for graphviz.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%package -n python2-graphviz
|
%package python2
|
||||||
%{?python_provide:%python_provide python2-graphviz}
|
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
|
# Remove before F30
|
||||||
Provides: %{name}-python = %{version}-%{release}
|
Provides: %{name}-python = %{version}-%{release}
|
||||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-python < %{version}-%{release}
|
Obsoletes: %{name}-python < 2.40.1-22
|
||||||
Group: Applications/Multimedia
|
Obsoletes: python2-%{name} < 2.40.1-22
|
||||||
Summary: Python extension for graphviz
|
|
||||||
Requires: %{name} = %{version}-%{release}, python2
|
|
||||||
|
|
||||||
%description -n python2-graphviz
|
%description python2
|
||||||
Python extension for graphviz.
|
Python extension for graphviz.
|
||||||
|
|
||||||
%if %{ARRRR}
|
%if %{ARRRR}
|
||||||
|
@ -522,7 +525,7 @@ php --no-php-ini \
|
||||||
%{_mandir}/man3/gv.3php*
|
%{_mandir}/man3/gv.3php*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -n python2-graphviz
|
%files python2
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/graphviz/python/
|
%{_libdir}/graphviz/python/
|
||||||
%{_libdir}/python*/*
|
%{_libdir}/python*/*
|
||||||
|
@ -557,6 +560,11 @@ php --no-php-ini \
|
||||||
%{_mandir}/man3/*.3tcl*
|
%{_mandir}/man3/*.3tcl*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 18 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 May 17 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-21
|
* Thu May 17 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-21
|
||||||
- Fixed CVE-2018-10196
|
- Fixed CVE-2018-10196
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue