- updated to 1.5

- docs seem to build now

diff --git a/python-rst.linker.spec b/python-rst.linker.spec
index 7e6fca496264dd0272b6e106f4a651d1a7fc86a5..f64be5481c21bdd685f334765a80ea26e4006bcf 100644 (file)
--- a/python-rst.linker.spec
+++ b/python-rst.linker.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_with    doc     # documentation (uses python2, needs repository metadata)
-%bcond_with    tests   # "make test" (broken with \--build-base)
+%bcond_without doc     # documentation (uses python2, needs repository metadata)
+%bcond_with    tests   # "make test" (pytest-runner doesn't support \--build-base)
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
@@ -11,30 +11,37 @@
 Summary:       rst.linker - Python 2 Sphinx plugin to add links to the changelog
 Summary(pl.UTF-8):     rst.linker - wtyczka Sphinksa dla Pythona 2 do dodawania odnośników do changeloga
 Name:          python-rst.linker
-Version:       1.1
-Release:       4
+Version:       1.5
+Release:       1
 License:       MIT
 Group:         Libraries/Python
-#Source0Download: https://pypi.python.org/pypi/rst.linker
-Source0:       https://pypi.python.org/packages/source/r/rst.linker/rst.linker-%{version}.zip
-# Source0-md5: 71f120eabb4c53277df78f3b15036d3d
+#Source0Download: https://pypi.python.org/simple/rst.linker/
+Source0:       https://pypi.python.org/packages/source/r/rst.linker/rst.linker-%{version}.tar.gz
+# Source0-md5: b9751f3b38448248ae77188fd96f65c8
 URL:           https://bitbucket.org/jaraco/rst.linker
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.710
 %if %{with python2}
 BuildRequires: python-devel >= 1:2.7
-BuildRequires: python-hgtools
-BuildRequires: python-modules
-BuildRequires: python-pytest
+BuildRequires: python-modules >= 1:2.7
+BuildRequires: python-pytest >= 2.8
+BuildRequires: python-pytest-runner
+BuildRequires: python-setuptools
+BuildRequires: python-setuptools_scm >= 1.9
+BuildRequires: python-six
 %{?with_doc:BuildRequires:     sphinx-pdg}
 %endif
 %if %{with python3}
 BuildRequires: python3-devel >= 1:3.2
-BuildRequires: python3-hgtools
-BuildRequires: python3-pytest
-BuildRequires: python3-modules
+BuildRequires: python3-modules >= 1:3.2
+BuildRequires: python3-pytest >= 2.8
+BuildRequires: python3-pytest-runner
+BuildRequires: python3-setuptools
+BuildRequires: python3-setuptools_scm >= 1.9
+BuildRequires: python3-six
 %endif
 Requires:      python-Sphinx
+Requires:      python-dateutil
 Requires:      python-six
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,6 +58,7 @@ Summary:      rst.linker - Python 3 Sphinx plugin to add links to the changelog
 Summary(pl.UTF-8):     rst.linker - wtyczka Sphinksa dla Pythona 3 do dodawania odnośników do changeloga
 Group:         Libraries/Python
 Requires:      python3-Sphinx
+Requires:      python3-dateutil
 Requires:      python3-six
 
 %description -n python3-rst.linker
@@ -108,24 +116,23 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.txt
+%doc CHANGES.rst
 %dir %{py_sitescriptdir}/rst
-%{py_sitescriptdir}/rst/__init__.py[co]
 %{py_sitescriptdir}/rst/linker.py[co]
 %{py_sitescriptdir}/rst.linker-%{version}-py*.egg-info
+%{py_sitescriptdir}/rst.linker-%{version}-py*-nspkg.pth
 %endif
 
 %if %{with python3}
 %files -n python3-rst.linker
 %defattr(644,root,root,755)
-%doc CHANGES.txt
+%doc CHANGES.rst
 %dir %{py3_sitescriptdir}/rst
-%{py3_sitescriptdir}/rst/__init__.py
 %{py3_sitescriptdir}/rst/linker.py
 %dir %{py3_sitescriptdir}/rst/__pycache__
-%{py3_sitescriptdir}/rst/__pycache__/__init__.cpython-*.py[co]
 %{py3_sitescriptdir}/rst/__pycache__/linker.cpython-*.py[co]
 %{py3_sitescriptdir}/rst.linker-%{version}-py*.egg-info
+%{py3_sitescriptdir}/rst.linker-%{version}-py*-nspkg.pth
 %endif
 
 %if %{with doc}