Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| ac70c83ce3 | |||
| f54d0761fd | |||
| 9b6338b53d | |||
| bbc9a432e9 |
@@ -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">c146b29d5b88a2d8e3e94a6454abb97cd6643237</param></service></servicedata>
|
||||
<param name="changesrevision">6ae645f7d1e17a9c25f0f167e0ffdfeeeb1c5c09</param></service></servicedata>
|
||||
13
fix-sp4ga-macros-inject.patch
Normal file
13
fix-sp4ga-macros-inject.patch
Normal 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.
BIN
python-rpm-macros-20241120.6ae645f.tar.xz
LFS
Normal file
BIN
python-rpm-macros-20241120.6ae645f.tar.xz
LFS
Normal file
Binary file not shown.
@@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Update to version 20241120.6ae645f:
|
||||
* Do sed in place
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 19 11:10:01 UTC 2024 - mcepl@cepl.eu
|
||||
|
||||
- Update to version 20241119.7609911:
|
||||
* Do not fix shebang on links to non-writeable files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 12 06:16:35 UTC 2024 - mcepl@cepl.eu
|
||||
|
||||
- Update to version 20241111.a34b5d8:
|
||||
* Follow symlinks when replacing shebang with sed
|
||||
* Only sed the shebang in executable files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 28 08:16:12 UTC 2024 - mcepl@cepl.eu
|
||||
|
||||
|
||||
@@ -17,12 +17,14 @@
|
||||
|
||||
|
||||
Name: python-rpm-macros
|
||||
Version: 20240618.c146b29
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user