Merge b1765ad into 6cf1c69

yast · Aug 17, 2018 · ba00f76 · ba00f76
2 parents 6cf1c69 + b1765ad
commit ba00f76
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 17 07:31:40 UTC 2018 - dgonzalez@suse.com
+
+- Update calls to YaST2 systemd classes (related to fate#319428)
+- 4.1.1
+
 -------------------------------------------------------------------
 Tue Aug  13 12:00:22 UTC 2018 - dgonzalez@suse.com
 

diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        4.1.0
+Version:        4.1.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -27,12 +27,12 @@ Group:          System/YaST
 License:        GPL-2.0
 BuildRequires:	perl-Digest-SHA1 perl-X500-DN perl-XML-Writer docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2-perl-bindings yast2-testsuite yast2-dns-server
 BuildRequires:  yast2-devtools >= 3.1.10
-# Yast2::ServiceWidget
-BuildRequires:  yast2 >= 4.1.0
+
+# Yast2::Systemd::Service
+BuildRequires:  yast2 >= 4.1.1
+Requires:       yast2 >= 4.1.1
 
 Requires:       perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
-# Yast2::ServiceWidget
-Requires:       yast2 >= 4.1.0
 # DnsServerAPI::IsServiceConfigurableExternally
 Requires:       yast2-dns-server >= 2.13.16
 

diff --git a/src/modules/DhcpServerUI.rb b/src/modules/DhcpServerUI.rb
@@ -11,6 +11,7 @@
 # Representation of the configuration of dhcp-server.
 # Input and output routines.
 require "yast"
+require "yast2/systemd/service"
 
 module Yast
   class DhcpServerUIClass < Module
@@ -24,7 +25,6 @@ def main
       Yast.import "Report"
       Yast.import "Service"
       Yast.import "SuSEFirewall"
-      Yast.import "SystemdService"
 
       @current_entry_type = ""
       @current_entry_id = ""
@@ -84,9 +84,9 @@ def DhcpServerUI
 
     # Object representing the DHCP service for its usage in the UI code
     #
-    # @return [Yast::SystemdServiceClass::Service]
+    # @return [Yast2::Systemd::Service]
     def service
-      @service ||= SystemdService.find(DhcpServer.ServiceName())
+      @service ||= Yast2::Systemd::Service.find(DhcpServer.ServiceName())
     end
 
     publish :variable => :current_entry_type, :type => "string"