6
0

Compare commits

..

4 Commits

3 changed files with 21 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
Index: python-rpm-macros-20241120.6ae645f/compile-macros.sh
===================================================================
--- python-rpm-macros-20241120.6ae645f.orig/compile-macros.sh
+++ python-rpm-macros-20241120.6ae645f/compile-macros.sh
@@ -19,7 +19,7 @@ done
echo "Setting buildset:"
echo "## Python Buildset Begin" | tee macros/040-builset-start
# First try to find the block from Factory
-sed -n '/## PYTHON MACROS BEGIN/,/## PYTHON MACROS END/ p' ~/.rpmmacros | tee macros/041-buildset
+sed -n '/## PYTHON MACROS BEGIN/,/## PYTHON MACROS END\|^### from/ p' ~/.rpmmacros | tee macros/041-buildset
# If that fails, find the old definitions (SUSE:SLE-15-SP?:GA, openSUSE:Leap:15.?)
if [ ! -s macros/041-buildset ]; then
sed -n '/%pythons/,/%add_python/ p' ~/.rpmmacros | tee macros/041-buildset

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 27 12:04:32 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
- Add patch fix-sp4ga-macros-inject.patch, to fix macros injection
with SP4:GA prjconf without ## PYTHON MACROS END. bsc#1233774
-------------------------------------------------------------------
Wed Nov 20 12:20:26 UTC 2024 - mcepl@cepl.eu

View File

@@ -23,6 +23,8 @@ 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-FIX-OPENSUSE fix-sp4ga-macros-inject.patch -- bsc#1233774
Patch0: fix-sp4ga-macros-inject.patch
# To keep user expectations reasonably sane
Recommends: python-rpm-generators
# Fedora compatibility