PR#4: Backport fix for flask >= 1.0 from upstream repo - rpms/python-fedora

rpms / python-fedora

#4 Backport fix for flask >= 1.0 from upstream repo

Merged 4 years ago by adamwill. Opened 4 years ago by frantisekz.

rpms/ frantisekz/python-fedora master into master

Backport fix for flask >= 1.0 from upstream repo

František Zatloukal • 4 years ago

6205326

0001-Make-flask_fas_openid-compatible-with-flask-1.0.patch

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ From 4719f10b3af1cf068e969387eab7df7e935003cd Mon Sep 17 00:00:00 2001`
		`+ From: Amitosh Swain Mahapatra <amitosh.swain@gmail.com>`
		`+ Date: Mon, 16 Jul 2018 20:39:36 +0530`
		`+ Subject: [PATCH] Make flask_fas_openid compatible with flask >= 1.0`
		`+`
		`+ ---`
		`+ flask_fas_openid.py \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/python-fedora-0.10.0/flask_fas_openid.py b/python-fedora-0.10.0/flask_fas_openid.py`
		`+ index 074b5de..3e3f6f7 100644`
		`+ --- a/python-fedora-0.10.0/flask_fas_openid.py`
		`+ +++ b/python-fedora-0.10.0/flask_fas_openid.py`
		`+ @@ -112,7 +112,7 @@ class FAS(object):`
		`+ # of old versions used sane version numbers.`
		`+ assume_recent = True`
		`+`
		`+ - if assume_recent or (major >= 0 and minor >= 10):`
		`+ + if assume_recent or (major > 0 or minor >= 10):`
		`+ self.app.json_encoder = FASJSONEncoder`
		`+`
		`+ @app.route('/_flask_fas_openid_handler/', methods=['GET', 'POST'])`
		`+ --`
		`+ 2.24.1`
		`+`

python-fedora.spec

file modified

+7 -2

		`@@ -15,7 +15,7 @@`

		`Name: python-fedora`
		`Version: 0.10.0`
		`- Release: 11%{?dist}`
		`+ Release: 12%{?dist}`
		`BuildArch: noarch`

		`License: LGPLv2+`
		`@@ -23,6 +23,8 @@`
		`URL: https://github.com/fedora-infra/python-fedora`
		`Source0: https://github.com/fedora-infra/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz`

		`+ Patch01: 0001-Make-flask_fas_openid-compatible-with-flask-1.0.patch`
		`+`
		`%if 0%{?with_python2}`
		`BuildRequires: python-lockfile`
		`BuildRequires: python-munch`
		`@@ -187,7 +189,7 @@`
		`%endif`

		`%prep`
		`- %autosetup -c -n %{name}-%{version}`
		`+ %autosetup -c -p1 -n %{name}-%{version}`
		`mv %{name}-%{version} python2`

		`# no more python2-fedora-turbogears2 (#1634646)`
		`@@ -324,6 +326,9 @@`
		`%endif`

		`%changelog`
		`+ * Tue Jan 21 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.10.0-12`
		`+ - Backport https://github.com/fedora-infra/python-fedora/commit/4719f10b3af1cf068e969387eab7df7e935003cd`
		`+`
		`* Tue Sep 3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.10.0-11`
		`- Drop python2 subpackages: python2-fedora, python2-fedora-flask (#1748242)`

frantisekz commented 4 years ago

https://github.com/fedora-infra/python-fedora/commit/4719f10b3af1cf068e969387eab7df7e935003cd

adamwill commented on line 29 of python-fedora.spec 4 years ago

I'm not sure about all the above. What's the -N for? Why patch after the rename not before?

1 new commit added

WIP

4 years ago

frantisekz commented 4 years ago

@adamwill Hmm, I've added WIP commit with cleaner version but patch fails to find the file. I am just probably totally blind, can you take a look at it? Thanks!

rebased onto 6205326

4 years ago