Merge pull request #794 from yast/build_deps

Removed BuildRequires: yast2-ntp-client (causing dependency cycle)
yast · Apr 4, 2019 · ced2966 · ced2966
2 parents fe848cc + 09397de
commit ced2966
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr  4 08:10:42 UTC 2019 - Ladislav Slezák <lslezak@suse.cz>
+
+- Removed BuildRequires: yast2-ntp-client (causing dependency cycle)
+  (related to the previous fix bsc#1129095)
+- 4.2.2
+
 -------------------------------------------------------------------
 Fri Mar 29 12:58:51 UTC 2019 - David Diaz <dgonzalez@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.2.1
+Version:        4.2.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -94,9 +94,6 @@ Requires:	yast2-users >= 3.2.8
 BuildRequires:	yast2-country >= 3.3.1
 Requires:	yast2-country >= 3.3.1
 
-# NtpSetup dialog (bsc#1129095)
-BuildRequires: yast2-ntp-client
-
 # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile
 # pkg-bindings are not directly required
 Conflicts:	yast2-pkg-bindings < 2.17.25

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -34,6 +34,8 @@ def stub_module(name)
 stub_module("ProductLicense")
 stub_module("Profile")
 stub_module("ProfileLocation")
+# we cannot depend on this module (circular dependency)
+stub_module("NtpClient")
 
 if ENV["COVERAGE"]
   require "simplecov"