From dbb0b4d17ab3d7932d424130c0fc8eaaaa7d0468 Mon Sep 17 00:00:00 2001 From: Sofia Boldyreva Date: Mon, 27 Jan 2025 15:15:28 +0100 Subject: [PATCH] Initial commit --- config.yaml | 53 +++++++++++++++++++ ...64-arch-as-exchangeable-to-x86_64_v2.patch | 42 +++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 config.yaml create mode 100644 files/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..f32997e --- /dev/null +++ b/config.yaml @@ -0,0 +1,53 @@ +actions: + - replace: + - target: "spec" + find: | + Patch0026: 0026-cli-list-show-a-hint-about-creating-a-case-in-RHTS.patch + Patch0027: 0027-cli-mark-the-suggestion-text-for-translation.patch + Patch0028: 0028-cli-get-list-of-possible-workflows-for-problem_data_.patch + replace: | + #Patch0026: 0026-cli-list-show-a-hint-about-creating-a-case-in-RHTS.patch + #Patch0027: 0027-cli-mark-the-suggestion-text-for-translation.patch + #Patch0028: 0028-cli-get-list-of-possible-workflows-for-problem_data_.patch + count: 1 + - target: "spec" + find: | + %if 0%{?rhel} + Requires: libreport-rhel >= %{libreport_ver} + Requires: libreport-plugin-rhtsupport >= %{libreport_ver} + %else + replace: "%if 0%{!?rhel}" + count: 2 + + - delete_line: + - target: "spec" + lines: + - "--enable-authenticated-autoreporting \\" + - | + %if 0%{?rhel} + Requires: libreport-plugin-rhtsupport + %endif + + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Andrei Lukoshko" + email: "alukoshko@almalinux.org" + line: + - "Add support for GPG subkeys" + - name: "Sergey Fokin" + email: "sfokin@cloudlinux.com" + line: + - "apply debranding" + + - add_files: + - type: "patch" + name: "9100-add_gpg_subkeys_support.patch" + number: 9100 + + - delete_files: + - file_name: "0026-cli-list-show-a-hint-about-creating-a-case-in-RHTS.patch" + - file_name: "0027-cli-mark-the-suggestion-text-for-translation.patch" + - file_name: "0028-cli-get-list-of-possible-workflows-for-problem_data_.patch" diff --git a/files/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch b/files/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch new file mode 100644 index 0000000..64a9e43 --- /dev/null +++ b/files/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch @@ -0,0 +1,42 @@ +From d63dfdba8f97ea42e1e3661de6bbaf273ccb790a Mon Sep 17 00:00:00 2001 +From: eabdullin +Date: Wed, 10 Jul 2024 15:36:47 +0300 +Subject: [PATCH] Set x86_64 arch as exchangeable to x86_64_v2 + +--- + src/poolarch.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/poolarch.c b/src/poolarch.c +index bc4582f..3b5a893 100644 +--- a/src/poolarch.c ++++ b/src/poolarch.c +@@ -24,13 +24,13 @@ static const char *archpolicies[] = { + #if defined(FEDORA) || defined(MAGEIA) + "x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386", + "x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386", +- "x86_64_v2", "x86_64_v2:x86_64:athlon:i686:i586:i486:i386", +- "x86_64", "x86_64:athlon:i686:i586:i486:i386", ++ "x86_64_v2", "x86_64_v2=x86_64:athlon:i686:i586:i486:i386", ++ "x86_64", "x86_64=x86_64_v2:athlon:i686:i586:i486:i386", + #else + "x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386", + "x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386", +- "x86_64_v2", "x86_64_v2:x86_64:i686:i586:i486:i386", +- "x86_64", "x86_64:i686:i586:i486:i386", ++ "x86_64_v2", "x86_64_v2=x86_64:i686:i586:i486:i386", ++ "x86_64", "x86_64=x86_64_v2:i686:i586:i486:i386", + #endif + "i686", "i686:i586:i486:i386", + "i586", "i586:i486:i386", +@@ -70,6 +70,7 @@ static const char *archpolicies[] = { + 0 + }; + ++ + void + pool_setarch(Pool *pool, const char *arch) + { +-- +2.39.3 (Apple Git-146) +