- updated to 2.5.4

- added python-/python3- packages

diff --git a/flake8.spec b/flake8.spec
index 6d27417ab1ad86d2a112fb828c2dc01b14f1f09d..ba8d9aa3c68c5bd3f1ca08368a4ddd47228ff1f6 100644 (file)
--- a/flake8.spec
+++ b/flake8.spec
@@ -1,27 +1,48 @@
 #
 # Conditional build:
+%bcond_without python2 # CPython 2.x module
+%bcond_without python3 # CPython 3.x module
 %bcond_without tests   # do not perform "make test"
 
 Summary:       The modular source code checker: pep8, pyflakes and co
+Summary(pl.UTF-8):     Modularne narzędzie do sprawdzania kodu źródłowego: pep8, pyflakes itp.
 Name:          flake8
-Version:       2.2.5
-Release:       2
+Version:       2.5.4
+Release:       1
 License:       MIT
 Group:         Development/Tools
+#Source0Download: https://pypi.python.org/simple/flake8/
 Source0:       https://pypi.python.org/packages/source/f/flake8/%{name}-%{version}.tar.gz
-# Source0-md5: 6dea927949b94c9d9495ab24bcdf9cf0
+# Source0-md5: a4585b3569b95c3f66acb8294a7f06ef
 URL:           https://pypi.python.org/pypi/flake8
-BuildRequires: rpmbuild(macros) >= 1.710
-BuildRequires: python3-distribute
-BuildRequires: python3-modules
+BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: rpm-pythonprov
+%if %{with python2}
+BuildRequires: python-modules >= 1:2.5
+BuildRequires: python-setuptools
+%if %{with tests}
+BuildRequires: python-mccabe >= 0.2.1
+BuildRequires: python-mock
+BuildRequires: python-nose
+BuildRequires: python-pep8 >= 1.5.7
+BuildRequires: python-pyflakes >= 0.8.1
+%endif
+%endif
+%if %{with python3}
+BuildRequires: python3-modules >= 1:3.2
+BuildRequires: python3-setuptools
 %if %{with tests}
 BuildRequires: python3-mccabe >= 0.2.1
 BuildRequires: python3-nose
 BuildRequires: python3-pep8 >= 1.5.7
 BuildRequires: python3-pyflakes >= 0.8.1
 %endif
-Requires:      python3-modules
+%endif
+%if %{with python3}
+Requires:      python3-flake8 = %{version}-%{release}
+%else
+Requires:      python-flake8 = %{version}-%{release}
+%endif
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,22 +52,97 @@ The modular source code checker. It is a wrapper around these tools:
 - pep8
 - Ned Batchelder's McCabe script
 
+%description -l pl.UTF-8
+Modularne narzędzie do sprawdzania kodu źródłowego. Jest to opakowanie
+dla narzędzi:
+- PyFlakes
+- pep8
+- skrypt McCabe autorstwa Neda Batcheldera
+
+%package -n python-flake8
+Summary:       The modular source code checker: pep8, pyflakes and co
+Summary(pl.UTF-8):     Modularne narzędzie do sprawdzania kodu źródłowego: pep8, pyflakes itp.
+Group:         Libraries/Python
+Requires:      python-modules
+
+%description -n python-flake8
+The modular source code checker. It is a wrapper around these tools:
+- PyFlakes
+- pep8
+- Ned Batchelder's McCabe script
+
+%description -n python-flake8 -l pl.UTF-8
+Modularne narzędzie do sprawdzania kodu źródłowego. Jest to opakowanie
+dla narzędzi:
+- PyFlakes
+- pep8
+- skrypt McCabe autorstwa Neda Batcheldera
+
+%package -n python3-flake8
+Summary:       The modular source code checker: pep8, pyflakes and co
+Summary(pl.UTF-8):     Modularne narzędzie do sprawdzania kodu źródłowego: pep8, pyflakes itp.
+Group:         Libraries/Python
+Requires:      python3-modules
+
+%description -n python3-flake8
+The modular source code checker. It is a wrapper around these tools:
+- PyFlakes
+- pep8
+- Ned Batchelder's McCabe script
+
+%description -n python3-flake8 -l pl.UTF-8
+Modularne narzędzie do sprawdzania kodu źródłowego. Jest to opakowanie
+dla narzędzi:
+- PyFlakes
+- pep8
+- skrypt McCabe autorstwa Neda Batcheldera
+
 %prep
 %setup -q
 
 %build
+%if %{with python2}
+%py_build %{?with_tests:test}
+%endif
+
+%if %{with python3}
 %py3_build %{?with_tests:test}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if %{with python2}
+%py_install
+cp -p $RPM_BUILD_ROOT%{_bindir}/flake8{,-2}
+%py_postclean
+%endif
+
+%if %{with python3}
 %py3_install
+cp -p $RPM_BUILD_ROOT%{_bindir}/flake8{,-3}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.rst CONTRIBUTORS.txt README.rst
+%doc CHANGES.rst CONTRIBUTORS.txt LICENSE README.rst
 %attr(755,root,root) %{_bindir}/flake8
-%{py3_sitescriptdir}/%{name}
-%{py3_sitescriptdir}/%{name}-%{version}-py*.egg-info
+
+%if %{with python2}
+%files -n python-flake8
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/flake8-2
+%{py_sitescriptdir}/flake8
+%{py_sitescriptdir}/flake8-%{version}-py*.egg-info
+%endif
+
+%if %{with python3}
+%files -n python3-flake8
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/flake8-3
+%{py3_sitescriptdir}/flake8
+%{py3_sitescriptdir}/flake8-%{version}-py*.egg-info
+%endif