17
0

4 Commits

6 changed files with 24 additions and 13 deletions

View File

@@ -3,4 +3,4 @@
<param name="url">git://github.com/openSUSE/python-rpm-macros.git</param>
<param name="changesrevision">80d37568d9732beb7fcc2cf27c5c08f9c01fade1</param></service><service name="tar_scm">
<param name="url">https://github.com/openSUSE/python-rpm-macros.git</param>
<param name="changesrevision">c3cfac80d6dd58d983cbd2eb087854aeca2908f2</param></service></servicedata>
<param name="changesrevision">6ae645f7d1e17a9c25f0f167e0ffdfeeeb1c5c09</param></service></servicedata>

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

Binary file not shown.

Binary file not shown.

View File

@@ -1,12 +1,8 @@
-------------------------------------------------------------------
Mon Oct 20 11:19:11 UTC 2025 - mcepl@cepl.eu
Wed Nov 27 12:04:32 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
- Update to version 20250923.c3cfac8:
* Remove py_setup_args macro completely.
* Move libalternative conf creation to FLAVOR_alternative_conf
* Update default-prjconf for primary python: python313
* Drop python38, add python314
* Make RPM macro expansions POSIX sh-compatible
- 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

@@ -1,7 +1,7 @@
#
# spec file for package python-rpm-macros
#
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,14 @@
Name: python-rpm-macros
Version: 20250923.c3cfac8
Version: 20241120.6ae645f
Release: 0
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