From f1e28beae68e1913d16496252be19ce1f66b81b8e1abcab0942621f38b97eb02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 15 Apr 2018 13:59:22 +0000
Subject: [PATCH] Accepting request 596722 from
 home:sebix:branches:devel:languages:python

- add fix_pycodestyle_240.patch to fix compatibility with pycodestyle
  version 2.4.0. fixes boo#1089438
- use %license macro for license file

OBS-URL: https://build.opensuse.org/request/show/596722
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flake8?expand=0&rev=34
---
 fix_pycodestyle_240.patch | 32 ++++++++++++++++++++++++++++++++
 python-flake8.changes     |  7 +++++++
 python-flake8.spec        |  8 +++++---
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 fix_pycodestyle_240.patch

diff --git a/fix_pycodestyle_240.patch b/fix_pycodestyle_240.patch
new file mode 100644
index 0000000..22cd715
--- /dev/null
+++ b/fix_pycodestyle_240.patch
@@ -0,0 +1,32 @@
+--- flake8-3.5.0/setup.py	2017-08-08 02:31:43.000000000 +0200
++++ flake8-3.5.0/setup.py	2018-04-15 15:08:31.063294441 +0200
+@@ -22,7 +22,7 @@
+     # And in which releases we will update those ranges here:
+     # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
+     "pyflakes >= 1.5.0, < 1.7.0",
+-    "pycodestyle >= 2.0.0, < 2.4.0",
++    "pycodestyle >= 2.0.0, < 2.5.0",
+     "mccabe >= 0.6.0, < 0.7.0",
+     "setuptools >= 30",
+ ]
+@@ -108,7 +108,8 @@
+             PEP8_PLUGIN('module_imports_on_top_of_file'),
+             PEP8_PLUGIN('compound_statements'),
+             PEP8_PLUGIN('explicit_line_join'),
+-            PEP8_PLUGIN('break_around_binary_operator'),
++            PEP8_PLUGIN('break_after_binary_operator'),
++            PEP8_PLUGIN('break_before_binary_operator'),
+             PEP8_PLUGIN('comparison_to_singleton'),
+             PEP8_PLUGIN('comparison_negative'),
+             PEP8_PLUGIN('comparison_type'),
+--- flake8-3.5.0/setup2.cfg	2017-10-23 13:16:02.000000000 +0200
++++ flake8-3.5.0/setup.cfg	2018-04-15 15:04:03.198239064 +0200
+@@ -9,7 +9,7 @@
+ 	enum34; python_version<"3.4"
+ 	configparser; python_version<"3.2"
+ 	pyflakes >= 1.5.0, < 1.7.0
+-	pycodestyle >= 2.0.0, < 2.4.0
++	pycodestyle >= 2.0.0, < 2.5.0
+ 	mccabe >= 0.6.0, < 0.7.0
+ 
+ [egg_info]
diff --git a/python-flake8.changes b/python-flake8.changes
index e74ba41..b6f96ab 100644
--- a/python-flake8.changes
+++ b/python-flake8.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Apr 15 10:20:40 UTC 2018 - sebix+novell.com@sebix.at
+
+- add fix_pycodestyle_240.patch to fix compatibility with pycodestyle
+  version 2.4.0. fixes boo#1089438
+- use %license macro for license file
+
 -------------------------------------------------------------------
 Thu Jan 11 12:11:06 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-flake8.spec b/python-flake8.spec
index 5132487..5865037 100644
--- a/python-flake8.spec
+++ b/python-flake8.spec
@@ -26,6 +26,8 @@ License:        MIT
 Group:          Development/Languages/Python
 Url:            https://gitlab.com/pycqa/flake8
 Source:         https://files.pythonhosted.org/packages/source/f/flake8/flake8-%{version}.tar.gz
+#PATCH-FIX-UPSTREAM fix_pycodestyle_240.patch
+Patch0:         fix_pycodestyle_240.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -51,7 +53,6 @@ Requires:       python-enum34
 %endif
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %python_subpackages
 
@@ -66,6 +67,7 @@ Flake8 runs all the tools by launching the single ``flake8`` script.
 
 %prep
 %setup -q -n flake8-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -85,8 +87,8 @@ Flake8 runs all the tools by launching the single ``flake8`` script.
 %python_exec setup.py test
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc LICENSE README.rst
+%doc README.rst
+%license LICENSE
 %python_alternative %{_bindir}/flake8
 %{python_sitelib}/*