From 1e528b629cab705557111824db1a1616a1675017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 12 Sep 2024 15:38:35 +0200 Subject: [PATCH 1/2] Import the changes from the OBS SLE15-SP6 project --- package/yast2-sudo.changes | 10 +++++----- package/yast2-sudo.spec | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package/yast2-sudo.changes b/package/yast2-sudo.changes index 70e87f9..43adb29 100644 --- a/package/yast2-sudo.changes +++ b/package/yast2-sudo.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger - -- Branch package for SP6 (bsc#1208913) - ------------------------------------------------------------------- Mon Mar 6 14:43:16 UTC 2023 - Martin Vidner @@ -10,6 +5,11 @@ Mon Mar 6 14:43:16 UTC 2023 - Martin Vidner (bsc#1206419) - 4.6.1 +------------------------------------------------------------------- +Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák + +- Bump version to 4.6.0 (bsc#1208913) + ------------------------------------------------------------------- Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slezák diff --git a/package/yast2-sudo.spec b/package/yast2-sudo.spec index 7ab5b32..c4a9611 100644 --- a/package/yast2-sudo.spec +++ b/package/yast2-sudo.spec @@ -1,7 +1,7 @@ # # spec file for package yast2-sudo # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: yast2-sudo Summary: YaST2 - Sudo configuration Version: 4.6.1 Release: 0 -Url: https://github.com/yast/yast-sudo +URL: https://github.com/yast/yast-sudo Group: System/YaST License: GPL-2.0-only @@ -31,11 +31,12 @@ Requires: yast2-users Requires: yast2 >= 2.21.22 Requires: yast2-ruby-bindings >= 1.0.0 -BuildRequires: yast2 yast2-users +BuildRequires: update-desktop-files +BuildRequires: yast2 BuildRequires: yast2-devtools >= 4.2.2 +BuildRequires: yast2-users BuildRequires: rubygem(%rb_default_ruby_abi:rspec) BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) -BuildRequires: update-desktop-files BuildArch: noarch From d1a61bc6dd0ab2177a8d56f165d8f8c94dfec695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 13 Sep 2024 10:23:32 +0200 Subject: [PATCH 2/2] Adapt files for the SLE-15-SP7 branch --- .github/workflows/ci.yml | 8 ++++---- Rakefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b900ab7..ff81646 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false container: - image: registry.opensuse.org/yast/sle-15/sp6/containers/yast-ruby + image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby steps: @@ -43,7 +43,7 @@ jobs: fail-fast: false container: - image: registry.opensuse.org/yast/sle-15/sp6/containers/yast-ruby + image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby steps: @@ -60,7 +60,7 @@ jobs: fail-fast: false container: - image: registry.opensuse.org/yast/sle-15/sp6/containers/yast-ruby + image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby steps: @@ -79,7 +79,7 @@ jobs: fail-fast: false container: - image: registry.opensuse.org/yast/sle-15/sp6/containers/yast-ruby + image: registry.opensuse.org/yast/sle-15/sp7/containers/yast-ruby steps: diff --git a/Rakefile b/Rakefile index 4849ef7..f111ced 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require "yast/rake" -Yast::Tasks.submit_to :sle15sp6 +Yast::Tasks.submit_to :sle15sp7 Yast::Tasks.configuration do |conf| #lets ignore license check for now