From 62586710ad75666f12c22faee14d3f2d651e0b20794b5e43d4b1a529d828d17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 20 Dec 2024 16:08:47 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main patterns-rpm-macros revision 422219630b93430eb813aa8f310b2295 --- macros.patterns | 13 +++++++++++++ patterns-rpm-macros.changes | 8 ++++++++ patterns-rpm-macros.spec | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/macros.patterns b/macros.patterns index f1c5a10..b89f7c5 100644 --- a/macros.patterns +++ b/macros.patterns @@ -69,3 +69,16 @@ Provides: pattern-category() = Server%20Functions %pattern_xfcedesktop \ Provides: pattern-category() = XFCE%20Desktop +%requires_on_transactional_recommends_otherwise() \ +Requires: ( %1 if (product(MicroOS) or product(SL-Micro))) \ +Recommends: ( %1 if (product(openSUSE) or product(SLES) or product(SLES-SAP))) + +%requires_on_traditional() \ +Requires: ( %1 if (product(openSUSE) or product(SLES) or product(SLES-SAP))) + +%recommends_on_traditional() \ +Recommends: ( %1 if (product(openSUSE) or product(SLES) or product(SLES-SAP))) + +%requires_on_transactional() \ +Requires: ( %1 if (product(MicroOS) or product(SL-Micro))) + diff --git a/patterns-rpm-macros.changes b/patterns-rpm-macros.changes index aa5e1a1..8781c2f 100644 --- a/patterns-rpm-macros.changes +++ b/patterns-rpm-macros.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 19 10:04:32 UTC 2024 - Frederic Crozat + +- Add requires_on_transactional_recommends_otherwise, + requires_on_traditional, requires_on_transactional and + recommends_on_traditional macros, allowing to merge patterns from + various products. + ------------------------------------------------------------------- Fri Aug 27 12:55:30 UTC 2021 - Callum Farmer diff --git a/patterns-rpm-macros.spec b/patterns-rpm-macros.spec index e9fb224..07c5ca2 100644 --- a/patterns-rpm-macros.spec +++ b/patterns-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package patterns-rpm-macros # -# Copyright (c) 2021 SUSE LLC +# 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