Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2023-09-22 21:47:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Fri Sep 22 21:47:13 2023 rev:141 rq:1112589 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2023-09-01 14:19:32.576943208 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.1770/salt.changes 2023-09-22 21:48:04.170287902 +0200 @@ -1,0 +2,8 @@ +Wed Sep 20 12:17:44 UTC 2023 - Pablo Suárez Hernández <pablo.suarezhernan...@suse.com> + +- Fix inconsistency in reported version by egg-info metadata (bsc#1215489) + +- Added: + * write-salt-version-before-building-when-using-with-s.patch + +------------------------------------------------------------------- New: ---- write-salt-version-before-building-when-using-with-s.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.CREM2W/_old 2023-09-22 21:48:12.154577753 +0200 +++ /var/tmp/diff_new_pack.CREM2W/_new 2023-09-22 21:48:12.166578189 +0200 @@ -302,6 +302,8 @@ Patch78: fixed-gitfs-cachedir_basename-to-avoid-hash-collisio.patch # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/600 Patch79: revert-usage-of-long-running-req-channel-bsc-1213960.patch +# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/65238 +Patch80: write-salt-version-before-building-when-using-with-s.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.CREM2W/_old 2023-09-22 21:48:12.734598810 +0200 +++ /var/tmp/diff_new_pack.CREM2W/_new 2023-09-22 21:48:12.762599827 +0200 @@ -1,3 +1,3 @@ -27bd69d21f942f677c6f257ae1b69a6e6ac6ec39 +3becea2e5b00beff724c22a8ae320d4567031c7b (No newline at EOF) ++++++ write-salt-version-before-building-when-using-with-s.patch ++++++ >From cc161359ef7432960ef2f0b8f816986fa6798403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernan...@suse.com> Date: Wed, 20 Sep 2023 13:07:29 +0100 Subject: [PATCH] Write salt version before building when using --with-salt-version (bsc#1215489) (#604) --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 8ca8a66d45..cf7e54f930 100755 --- a/setup.py +++ b/setup.py @@ -591,6 +591,10 @@ HOME_DIR = {home_dir!r} class Build(build): def run(self): + if getattr(self.distribution, "with_salt_version", False): + self.distribution.salt_version_hardcoded_path = SALT_VERSION_HARDCODED + self.run_command("write_salt_version") + # Run build.run function build.run(self) salt_build_ver_file = os.path.join(self.build_lib, "salt", "_version.txt") -- 2.41.0
