testing/python-rpm-macros
SHA256
3
0
Fork 0
forked from pool/python-rpm-macros
Code Pull Requests Activity

Remove multiple_flavors.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python-rpm-macros?expand=0&rev=115
This commit is contained in:
Matej Cepl 2020-10-21 11:22:08 +00:00 committed by Git OBS Bridge
parent 4a9905bac6
commit b4fd46a90f
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
multiple_flavors.patch
View File

@ -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#")}

6
python-rpm-macros.spec
View File

@ -23,9 +23,6 @@ Summary: RPM macros for building of Python modules
License: WTFPL License: WTFPL
URL: https://github.com/opensuse/python-rpm-macros URL: https://github.com/opensuse/python-rpm-macros
Source: python-rpm-macros-%{version}.tar.xz 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 # To keep user expectations reasonably sane
Recommends: python-rpm-generators Recommends: python-rpm-generators
# Fedora compatibility # Fedora compatibility
@ -51,8 +48,7 @@ This package contains the dependencies for Python RPMs to generate
dependencies automatically. dependencies automatically.
%prep %prep
%setup -q %autosetup
%autopatch -p1
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} < 1330
mv macros-default-pythons macros/035-default-pythons mv macros-default-pythons macros/035-default-pythons