| |
@@ -1,12 +1,8 @@
|
| |
- %if 0%{?fedora} || 0%{?rhel} >= 8
|
| |
- %global with_python3 1
|
| |
- %endif
|
| |
-
|
| |
%global srcname sphinxcontrib-bibtex
|
| |
|
| |
Name: python-%{srcname}
|
| |
Version: 0.4.0
|
| |
- Release: 3%{?dist}
|
| |
+ Release: 4%{?dist}
|
| |
Summary: Sphinx extension for BibTeX style citations
|
| |
|
| |
License: BSD
|
| |
@@ -16,19 +12,9 @@
|
| |
# Use orderedset instead of oset; the latter has a dead upstream
|
| |
Patch0: %{name}-orderedset.patch
|
| |
|
| |
- BuildRequires: python2-coverage
|
| |
- BuildRequires: python2-devel
|
| |
- BuildRequires: python2-latexcodec
|
| |
- BuildRequires: python2-nose
|
| |
- BuildRequires: python2-orderedset
|
| |
- BuildRequires: python2-pybtex
|
| |
- BuildRequires: python2-pybtex-docutils
|
| |
- BuildRequires: python2-setuptools
|
| |
- BuildRequires: python2-six
|
| |
- BuildRequires: python2-sphinx
|
| |
- BuildRequires: python2-sphinx-testing
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
+ BuildRequires: python3-sphinx
|
| |
+ BuildRequires: python3-sphinx-testing
|
| |
+
|
| |
BuildRequires: python3-coverage
|
| |
BuildRequires: python3-devel
|
| |
BuildRequires: python3-latexcodec
|
| |
@@ -40,7 +26,6 @@
|
| |
BuildRequires: python3-six
|
| |
BuildRequires: python3-sphinx
|
| |
BuildRequires: python3-sphinx-testing
|
| |
- %endif
|
| |
|
| |
%global common_desc \
|
| |
This package contains a Sphinx extension for BibTeX style citations.\
|
| |
@@ -56,22 +41,6 @@
|
| |
%description
|
| |
%common_desc
|
| |
|
| |
- %package -n python2-%{srcname}
|
| |
- Summary: Sphinx extension for BibTeX style citations
|
| |
- Requires: python2-latexcodec
|
| |
- Requires: python2-orderedset
|
| |
- Requires: python2-pybtex
|
| |
- Requires: python2-pybtex-docutils
|
| |
- Requires: python2-six
|
| |
-
|
| |
- Provides: bundled(jquery)
|
| |
- Provides: bundled(js-underscore)
|
| |
- %{?python_provide:%python_provide python2-%{srcname}}
|
| |
-
|
| |
- %description -n python2-%{srcname}
|
| |
- %common_desc
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
%package -n python3-%{srcname}
|
| |
Summary: Sphinx extension for BibTeX style citations
|
| |
Requires: python3-latexcodec
|
| |
@@ -86,7 +55,6 @@
|
| |
|
| |
%description -n python3-%{srcname}
|
| |
%common_desc
|
| |
- %endif
|
| |
|
| |
%package doc
|
| |
Summary: Documentation for python-%{srcname}
|
| |
@@ -95,87 +63,38 @@
|
| |
Documentation for python-%{srcname}.
|
| |
|
| |
%prep
|
| |
- %setup -q -c
|
| |
- pushd %{srcname}-%{version}
|
| |
+ %setup -q -n %{srcname}-%{version}
|
| |
%patch0
|
| |
- popd
|
| |
|
| |
# Don't run the tinkerer integration test since Fedora doesn't have tinkerer
|
| |
- rm -fr %{srcname}-%{version}/test/{test_issue1.py,issue1}
|
| |
-
|
| |
- # Prepare for python3 build
|
| |
- cp -a %{srcname}-%{version} python3-%{srcname}-%{version}
|
| |
+ rm -fr test/{test_issue1.py,issue1}
|
| |
|
| |
%build
|
| |
- # Python 2 build
|
| |
- pushd %{srcname}-%{version}
|
| |
- %py2_build
|
| |
- popd
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
- # Python 3 build
|
| |
- pushd python3-%{srcname}-%{version}
|
| |
%py3_build
|
| |
- popd
|
| |
- %endif
|
| |
|
| |
# Build documentation
|
| |
- %if 0%{?with_python3}
|
| |
- pushd python3-%{srcname}-%{version}
|
| |
- PYTHONPATH=$PWD sphinx-build-%{python3_version} doc html
|
| |
- %else
|
| |
- pushd %{srcname}-%{version}
|
| |
- PYTHONPATH=$PWD sphinx-build-%{python2_version} doc html
|
| |
- %endif
|
| |
+ PYTHONPATH=$PWD sphinx-build-3 doc html
|
| |
rm -fr html/{.buildinfo,.doctrees}
|
| |
- popd
|
| |
|
| |
%install
|
| |
- # Python 2 install
|
| |
- pushd %{srcname}-%{version}
|
| |
- %py2_install
|
| |
- popd
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
- # Python 3 install
|
| |
- pushd python3-%{srcname}-%{version}
|
| |
%py3_install
|
| |
- popd
|
| |
- %endif
|
| |
|
| |
%check
|
| |
- # Test the python 2 build
|
| |
- pushd %{srcname}-%{version}
|
| |
- PYTHONPATH=$PWD nosetests-%{python2_version} -v
|
| |
- popd
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
- # Test the python 3 build
|
| |
- pushd python3-%{srcname}-%{version}
|
| |
- PYTHONPATH=$PWD nosetests-%{python3_version} -v
|
| |
- popd
|
| |
- %endif
|
| |
-
|
| |
- %files -n python2-%{srcname}
|
| |
- %license %{srcname}-%{version}/LICENSE.rst
|
| |
- %{python2_sitelib}/sphinxcontrib/
|
| |
- %{python2_sitelib}/sphinxcontrib_bibtex*
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
+ PYTHONPATH=$PWD nosetests-3 -v
|
| |
+
|
| |
%files -n python3-%{srcname}
|
| |
- %license python3-%{srcname}-%{version}/LICENSE.rst
|
| |
+ %license LICENSE.rst
|
| |
%{python3_sitelib}/sphinxcontrib/
|
| |
%{python3_sitelib}/sphinxcontrib_bibtex*
|
| |
- %endif
|
| |
|
| |
%files doc
|
| |
- %if 0%{?with_python3}
|
| |
- %doc python3-%{srcname}-%{version}/html/*
|
| |
- %else
|
| |
- %doc %{srcname}-%{version}/html/*
|
| |
- %endif
|
| |
+ %doc html/*
|
| |
|
| |
%changelog
|
| |
+ * Thu Oct 25 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.0-4
|
| |
+ - Subpackage python2-sphinxcontrib-bibtex has been removed
|
| |
+ See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
| |
+
|
| |
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-3
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
| |
|
| |