python-graphviz.spec

@@ -1,102 +1,109 @@
-%global _empty_manifest_terminate_build 0
+%global common_description %{expand:
-Name:		python-graphviz
-Version:	0.20.1
-Release:	1
-Summary:	Simple Python interface for Graphviz
-License:	MIT
-URL:		https://github.com/xflr6/graphviz
-Source0:        https://files.pythonhosted.org/packages/source/g/graphviz/graphviz-%{version}.zip
-BuildArch:	noarch
-%description
 This package makes it easier to create and render a graph description in 
 the DOT language which from the Python Graphviz graph drawing software.
 
+You can create and assemble a graph object by adding nodes and edges with
+the package. Also the graph can be saved to a file by retrieving its DOT
+source code string, then you can render the graph with the Graphviz graph
+drawing software.}
+
+Name:           python-graphviz
+Version:        0.8.3
+Release:        4
+# Set Epoch to avoid being obsoleted by graphviz-python
+Epoch:          1
+Summary:        Simple Python interface for Graphviz
+
+License:        MIT
+URL:            https://github.com/xflr6/graphviz
+Source0:        https://files.pythonhosted.org/packages/source/g/graphviz/graphviz-0.8.3.zip
+BuildArch:      noarch
+ 
+%description
+%{common_description}
+
+
+%package -n     python2-graphviz
+Summary:        %{summary}
+%{?python_provide:%python_provide python2-graphviz}
+ 
+BuildRequires:  python2-devel python2dist(flake8) python2dist(mock) >= 2 python2dist(pep8-naming)
+BuildRequires:  python2dist(pytest) >= 3.3 python2dist(pytest-cov) python2dist(pytest-mock)
+BuildRequires:  python2dist(setuptools) python2dist(twine) python2dist(wheel)
+Requires:       graphviz
+
+%description -n python2-graphviz
+%{common_description}
+
 
 %package -n     python3-graphviz
-Summary:	Simple Python interface for Graphviz
+Summary:        %{summary}
-Provides:	python-graphviz
+%{?python_provide:%python_provide python3-graphviz}
-BuildRequires:	python3-devel
+ 
-BuildRequires:	python3-setuptools
+BuildRequires:  python3-devel python3dist(flake8) python3dist(mock) >= 2 python3dist(pep8-naming)
-Requires:	python3-tox
+BuildRequires:  python3dist(pytest) >= 3.3 python3dist(pytest-cov) python3dist(pytest-mock) 
-Requires:	python3-flake8
+BuildRequires:  python3dist(setuptools) python3dist(twine) python3dist(sphinx)
-Requires:	python3-wheel
+Requires:       graphviz
-Requires:	python3-sphinx
+
-Requires:	python3-sphinx_rtd_theme
-Requires:	python3-mock
-Requires:	python3-pytest
-Requires:	python3-pytest-mock
-Requires:	python3-pytest-cov
 %description -n python3-graphviz
-This package makes it easier to create and render a graph description in 
+%{common_description}
-the DOT language which from the Python Graphviz graph drawing software.
 
 
-%package help
+%package -n python-graphviz-doc
-Summary:	Development documents and examples for graphviz
+Summary:        Documentation for %{name}
-Provides:	python3-graphviz-doc
+%description -n python-graphviz-doc
-%description help
+%{common_description}
-This package makes it easier to create and render a graph description in 
-the DOT language which from the Python Graphviz graph drawing software.
 
+This is the documentation package.
 
 %prep
-%autosetup -n graphviz-%{version} -p1
+%autosetup -n graphviz-%{version}
+# Remove bundled egg-info
+rm -rf graphviz.egg-info
+
+sed -i 's/\r//' docs/*.rst
+sed -i 's/\r//' README.rst
+
 
 %build
+%py2_build
 %py3_build
 
+# generate html docs 
+PYTHONPATH=${PWD} sphinx-build-3 docs html
+# remove the sphinx-build leftovers
+rm -rf html/.{doctrees,buildinfo}
+
+
 %install
+%py2_install
 %py3_install
-install -d -m755 %{buildroot}/%{_pkgdocdir}
+
-if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
-if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
-if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi
-if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi
-pushd %{buildroot}
-if [ -d usr/lib ]; then
-	find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
-fi
-if [ -d usr/lib64 ]; then
-	find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
-fi
-if [ -d usr/bin ]; then
-	find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
-fi
-if [ -d usr/sbin ]; then
-	find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst
-fi
-touch doclist.lst
-if [ -d usr/share/man ]; then
-	find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst
-fi
-popd
-mv %{buildroot}/filelist.lst .
-mv %{buildroot}/doclist.lst .
 
 %check
+%{__python2} setup.py test
 %{__python3} setup.py test
 
-%files -n python3-graphviz -f filelist.lst
-%dir %{python3_sitelib}/*
 
-%files help -f doclist.lst
+%files -n python2-graphviz
-%{_docdir}/*
+%license LICENSE.txt
+%doc README.rst
+%{python2_sitelib}/graphviz
+%{python2_sitelib}/graphviz-%{version}-py?.?.egg-info
+
+
+%files -n python3-graphviz
+%license LICENSE.txt
+%doc README.rst
+%{python3_sitelib}/graphviz
+%{python3_sitelib}/graphviz-%{version}-py?.?.egg-info
+
+
+%files -n python-graphviz-doc
+%doc html
+%license LICENSE.txt
+
 
 %changelog
-* Tue Apr 04 2023 yaoxin <yaoxin30@h-partners.com> - 0.20.1-1
-- Update to 0.20.1
-
-* Mon Jul 25 2022 wulei <wulei80@h-partners.com> - 0.16-3
-- Remove extras requires python-pep8-naming and python-twine
-
-* Wed Jul 28 2021 openstack-sig <openstack@openeuler.org>
-- Fix requires
-
-* Fri Jul 09 2021 openstack-sig <openstack@openeuler.org>
-- Update to 0.16
-
-* Thu Oct 22 2020 maminjie <maminjie1@huawei.com> - 1:0.8.3-5
-- Drop python2 support
-
 * Fri Mar 13 2020 yinzhenling <yinzhenling2@huawei.com> - 1:0.8.3-4
 - Initial package.

python-graphviz.yaml

@@ -1,4 +0,0 @@
-version_control: pypi
-src_repo: graphviz
-tag_prefix: "^"
-separator: "."