From 9119e4a5ea63afbca6299a26ac64a36931033081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 12 Sep 2024 10:41:12 +0200 Subject: [PATCH 1/2] Import the changes from the OBS SLE15-SP6 project --- package/skelcd-control-SLED.changes | 4 ++-- package/skelcd-control-SLED.spec | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/skelcd-control-SLED.changes b/package/skelcd-control-SLED.changes index 929d5ff..0c9d95a 100644 --- a/package/skelcd-control-SLED.changes +++ b/package/skelcd-control-SLED.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger +Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák -- Branch package for SP6 (bsc#1208913) +- Bump version to 15.6.0 (bsc#1208913) ------------------------------------------------------------------- Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slezák diff --git a/package/skelcd-control-SLED.spec b/package/skelcd-control-SLED.spec index 12fa850..cb157da 100644 --- a/package/skelcd-control-SLED.spec +++ b/package/skelcd-control-SLED.spec @@ -1,7 +1,7 @@ # -# spec file for package skelcd-control-SLED +# spec file # -# Copyright (c) 2014 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,7 +37,7 @@ BuildRequires: libxml2-tools # Added software/default_modules BuildRequires: yast2-installation-control >= 4.2.9 # To migrate old KDE desktop -Requires: sle15-desktop-migration +Requires: sle15-desktop-migration ###################################################################### # @@ -70,8 +70,8 @@ Requires: yast2-ntp-client Requires: yast2-proxy # clients/inst_product_upgrade_license.rb Requires: yast2-packager >= 4.0.29 -Requires: yast2-services-manager Requires: yast2-configuration-management +Requires: yast2-services-manager Requires: yast2-slp Requires: yast2-trans-stats Requires: yast2-tune @@ -84,8 +84,8 @@ Requires: rubygem(%{rb_default_ruby_abi}:byebug) # Architecture specific packages # %ifarch s390 s390x -Requires: yast2-reipl -Requires: yast2-s390 +Requires: yast2-reipl +Requires: yast2-s390 %endif Provides: system-installation() = SLED @@ -93,7 +93,7 @@ Provides: system-installation() = SLED # ###################################################################### -Url: https://github.com/yast/skelcd-control-SLED +URL: https://github.com/yast/skelcd-control-SLED AutoReqProv: off Version: 15.6.0 Release: 0 From 869f485837c63fae02e78ba8801b03be19c5f2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 13 Sep 2024 09:24:46 +0200 Subject: [PATCH 2/2] Adapt files for the SLE-15-SP7 branch --- .github/workflows/ci.yml | 2 +- Rakefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09af392..1b4436f 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: diff --git a/Rakefile b/Rakefile index c7cb674..0588627 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