Merge pull request #221 from yast/drop-yast2-journal-dependency

Drop yast2 journal dependency

Author: lslezak

package/yast2-services-manager.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  9 13:49:00 UTC 2026 - Ladislav Slezák <lslezak@suse.com>
+
+- Drop the yast2-journal build dependency in SLES, this allows also
+  dropping libyui from SLES (related to bsc#1254978)
+- 5.0.3
+
 -------------------------------------------------------------------
 Tue Mar 10 09:00:28 UTC 2026 - Michal Filka <mfilka@suse.com>
 
@@ -379,7 +386,6 @@ Wed Dec 17 12:18:46 CET 2014 - schubi@suse.de
 - 3.1.38
 
 -------------------------------------------------------------------
-
 Thu Dec  4 09:51:33 UTC 2014 - jreidinger@suse.com
 
 - remove X-KDE-Library from desktop file (bnc#899104)

package/yast2-services-manager.spec

@@ -37,8 +37,13 @@ BuildRequires:  ruby
 # 'target' argument for Installation::AutoClient#export method
 BuildRequires:  yast2 >= 4.3.10
 BuildRequires:  yast2-ruby-bindings >= 1.2.0
-# To show service logs
+
+# only in openSUSE Tumbleweed or Leap, not in SLES
+%if 0%{?suse_version} == 1699 || 0%{?is_opensuse}
+# needed just to run an unit test
 BuildRequires:  yast2-journal >= 4.1.1
+%endif
+
 # Support for 'data' directory in rake install task
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:yast-rake) >= 0.1.7
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)

test/clients/services_manager_test.rb

@@ -23,7 +23,11 @@
 require_relative '../test_helper'
 
 require "yast"
-require "y2journal"
+begin
+  require "y2journal"
+rescue LoadError
+  puts "yast2-journal not installed, skipping journal tests"
+end
 require "services-manager/clients/services_manager"
 
 describe Y2ServicesManager::Clients::ServicesManager do
@@ -42,16 +46,18 @@
       subject.run
     end
 
-    context "when yast2-journal is installed" do
-      before do
-        allow(subject).to receive(:journal_loaded?).and_return(true)
-      end
+    if defined?(::Y2Journal)
+      context "when yast2-journal is installed" do
+        before do
+          allow(subject).to receive(:journal_loaded?).and_return(true)
+        end
 
-      it "runs the dialog with a button to show the logs" do
-        expect(Y2ServicesManager::Dialogs::ServicesManager).to receive(:new)
-          .with(hash_including(show_logs_button: true)).and_return(dialog)
+        it "runs the dialog with a button to show the logs" do
+          expect(Y2ServicesManager::Dialogs::ServicesManager).to receive(:new)
+            .with(hash_including(show_logs_button: true)).and_return(dialog)
 
-        subject.run
+          subject.run
+        end
       end
     end
 

test/dialogs/services_manager_test.rb

@@ -23,7 +23,11 @@
 require_relative '../test_helper'
 
 require "yast"
-require "y2journal"
+begin
+  require "y2journal"
+rescue LoadError
+  puts "yast2-journal not installed, skipping journal tests"
+end
 require "services-manager/dialogs/services_manager"
 
 describe Y2ServicesManager::Dialogs::ServicesManager do
@@ -331,24 +335,26 @@ def expect_refresh_buttons(&block)
       include_examples "save with errors"
     end
 
-    context "when user selects 'Show Log' button" do
-      let(:user_input) { [:logs_button, :cancel] }
+    if defined?(::Y2Journal)
+      context "when user selects 'Show Log' button" do
+        let(:user_input) { [:logs_button, :cancel] }
 
-      let(:entries_dialog) { instance_double(Y2Journal::EntriesDialog, run: nil) }
+        let(:entries_dialog) { instance_double(Y2Journal::EntriesDialog, run: nil) }
 
-      let(:services_specs) { [sshd_specs2, postfix_specs] }
+        let(:services_specs) { [sshd_specs2, postfix_specs] }
 
-      let(:sshd_specs2) { sshd_specs.merge(keywords: keywords) }
+        let(:sshd_specs2) { sshd_specs.merge(keywords: keywords) }
 
-      let(:keywords) { ["sshd.service", "sshd.socket"] }
+        let(:keywords) { ["sshd.service", "sshd.socket"] }
 
-      it "shows the systemd journal entries for the selected service" do
-        expect(Y2Journal::EntriesDialog).to receive(:new) do |params|
-          filters = params[:query].filters["unit"]
-          expect(filters).to contain_exactly(*keywords)
-        end.and_return(entries_dialog)
+        it "shows the systemd journal entries for the selected service" do
+          expect(Y2Journal::EntriesDialog).to receive(:new) do |params|
+            filters = params[:query].filters["unit"]
+            expect(filters).to contain_exactly(*keywords)
+          end.and_return(entries_dialog)
 
-        subject.run
+          subject.run
+        end
       end
     end