From b4fd46a90f07b1cb8fc7ec9ef726d477526a077c6b00daa6b269db9e53e875e6 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 21 Oct 2020 11:22:08 +0000
Subject: [PATCH] Remove multiple_flavors.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=115
---
 multiple_flavors.patch | 38 --------------------------------------
 python-rpm-macros.spec |  6 +-----
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 multiple_flavors.patch

diff --git a/multiple_flavors.patch b/multiple_flavors.patch
deleted file mode 100644
index 39396e7..0000000
--- a/multiple_flavors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/compile-macros.sh
-+++ b/compile-macros.sh
-@@ -1,10 +1,10 @@
- #!/bin/bash
- 
--FLAVORS="python2 python3 pypy3"
-+FLAVORS="python2 python3 python36 python38 pypy3"
- 
- # order of BUILDSET is important, it is copied to order of %pythons,
- # and that determines the last installed binary
--BUILDSET="python2 python3"
-+BUILDSET="python2 python36 python38"
- 
- 
- ### flavor-specific: generate from flavor.in
---- a/flavor.in
-+++ b/flavor.in
-@@ -1,14 +1,14 @@
- ##### macro definitions for flavor "#FLAVOR#" #####
- 
--%__#FLAVOR#               /usr/bin/#FLAVOR#
--
- %#FLAVOR#_shbang_opts     %py_shbang_opts
- 
-+%__#FLAVOR#               /usr/bin/%{lua: print((string.gsub("#FLAVOR#", "(%w+%d)(%d)", "%1.%2")))}
-+
- %#FLAVOR#_prefix          #FLAVOR#
--%#FLAVOR#_sitelib         %{_python_sysconfig_path #FLAVOR# purelib}
--%#FLAVOR#_sitearch        %{_python_sysconfig_path #FLAVOR# platlib}
--%#FLAVOR#_version         %{_python_sysconfig_var #FLAVOR# py_version_short}
--%#FLAVOR#_version_nodots  %{_python_sysconfig_var #FLAVOR# py_version_nodot}
-+%#FLAVOR#_sitelib         %{_python_sysconfig_path %__#FLAVOR# purelib}
-+%#FLAVOR#_sitearch        %{_python_sysconfig_path %__#FLAVOR# platlib}
-+%#FLAVOR#_version         %{_python_sysconfig_var  %__#FLAVOR# py_version_short}
-+%#FLAVOR#_version_nodots  %{_python_sysconfig_var  %__#FLAVOR# py_version_nodot}
- 
- %#FLAVOR#_sysconfig_path() %{_rec_macro_helper}%{lua:call_sysconfig("path", "#FLAVOR#")}
- %#FLAVOR#_sysconfig_var()  %{_rec_macro_helper}%{lua:call_sysconfig("var", "#FLAVOR#")}
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index b6aa643..f6caa2c 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -23,9 +23,6 @@ Summary:        RPM macros for building of Python modules
 License:        WTFPL
 URL:            https://github.com/opensuse/python-rpm-macros
 Source:         python-rpm-macros-%{version}.tar.xz
-# PATCH-FEATURE-OPENSUSE multiple_flavors.patch mcepl@suse.com
-# make work with multiple python3 flavours.
-Patch0:         multiple_flavors.patch
 # To keep user expectations reasonably sane
 Recommends:     python-rpm-generators
 # Fedora compatibility
@@ -51,8 +48,7 @@ This package contains the dependencies for Python RPMs to generate
 dependencies automatically.
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup
 
 %if 0%{?suse_version} < 1330
 mv macros-default-pythons macros/035-default-pythons