Merge 94a27bc into 628f3dd

yast · Jun 2, 2019 · d159e45 · d159e45
2 parents 628f3dd + 94a27bc
commit d159e45
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 33 deletions.
diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 31 12:28:42 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
 -------------------------------------------------------------------
 Wed Dec 12 13:16:55 UTC 2018 - lslezak@suse.cz
 

diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec
@@ -12,69 +12,82 @@
 # 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/
 #
 
 
 Name:           yast2-dhcp-server
-Version:        4.1.5
+Version:        4.2.0
 Release:        0
+Summary:        YaST2 - DHCP Server Configuration
+Group:          System/YaST
+License:        GPL-2.0-only
+Url:            https://github.com/yast-dhcp-server
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
-Group:          System/YaST
-License:        GPL-2.0-only
-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:  perl-Digest-SHA1
+BuildRequires:  perl-X500-DN
+BuildRequires:  perl-XML-Writer
+BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  doxygen
+BuildRequires:  libxslt
+BuildRequires:  perl-XML-Writer
+BuildRequires:  popt-devel
+BuildRequires:  sgml-skel
+BuildRequires:  update-desktop-files
+BuildRequires:  yast2-perl-bindings
+BuildRequires:  yast2-testsuite
+BuildRequires:  yast2-dns-server
 BuildRequires:  yast2-devtools >= 3.1.10
 # Yast2::ServiceWidget
 BuildRequires:  yast2 >= 4.1.0
 BuildRequires:  rubygem(%rb_default_ruby_abi:rspec)
 BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
 
-Requires:       perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
+Requires:       perl-gettext
+Requires:       yast2-perl-bindings
+Requires:       bind-utils
+Requires:       perl-X500-DN
+Requires:       yast2-ldap
+Requires:       perl-Digest-SHA1
+Requires:       perl-Parse-RecDescent
 # firewalld_wrapper.rb
 Requires:       yast2 >= 4.1.22
-
 # DnsServerAPI::IsServiceConfigurableExternally
 Requires:       yast2-dns-server >= 2.13.16
-
-BuildArchitectures:	noarch
-
 Requires:       yast2-ruby-bindings >= 1.0.0
 
-Summary:	YaST2 - DHCP Server Configuration
+BuildArch:      noarch
 
 %description
 This package contains the YaST2 component for DHCP server
 configuration.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
 %check
-rake test:unit
+%yast_check
 
 %build
 %yast_build
 
 %install
 %yast_install
-
+%yast_metainfo
 
 %files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/dhcp-server
-%{yast_yncludedir}/dhcp-server/*
-%{yast_clientdir}/dhcp-server.rb
-%{yast_clientdir}/dhcp-server_*.rb
-%{yast_moduledir}/*
-%{yast_desktopdir}/dhcp-server.desktop
-%{yast_scrconfdir}/cfg_dhcpd.scr
-%{yast_scrconfdir}/etc_dhcpd_conf.scr
-%{yast_agentdir}/ag_dhcpd_conf
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
 %doc %{yast_docdir}
 %license COPYING
 %{yast_icondir}
-%{yast_schemadir}/autoyast/rnc/dhcp-server.rnc
+%{yast_schemadir}
 
+%changelog
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -40,7 +40,7 @@ schemafiles_DATA = \
   autoyast-rnc/dhcp-server.rnc
 
 desktop_DATA = \
-  desktop/dhcp-server.desktop
+  desktop/org.opensuse.yast.DHCPServer.desktop
 
 symbolicdir = @icondir@/hicolor/symbolic/apps
 symbolic_DATA = \

diff --git a/src/desktop/dhcp-server.desktop → ...ktop/org.opensuse.yast.DHCPServer.desktop b/src/desktop/dhcp-server.desktop → ...ktop/org.opensuse.yast.DHCPServer.desktop
@@ -21,6 +21,7 @@ X-SuSE-YaST-AutoInstSchema=dhcp-server.rnc
 Icon=yast-dhcp-server
 Exec=xdg-su -c "/sbin/yast2 dhcp-server"
 
-Name=DHCP Server
-GenericName=Configure a DHCP server
+Name=YaST DHCP Server
+GenericName=DHCP Server
+Comment=Configure a DHCP server
 StartupNotify=true
diff --git a/src/include/dhcp-server/dns-server-management.rb b/src/include/dhcp-server/dns-server-management.rb
@@ -1091,7 +1091,7 @@ def ManageDNSServer(param_current_settings)
         Label.CancelButton,
         Label.OKButton
       )
-      Wizard.SetDesktopTitleAndIcon("dhcp-server")
+      Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
 
       InitDNSServerConfiguration(@current_settings)
 

diff --git a/src/include/dhcp-server/dns-server-wizard.rb b/src/include/dhcp-server/dns-server-wizard.rb
@@ -1384,7 +1384,7 @@ def RunNewDNSServerWizard(dhcp_settings)
       }
 
       Wizard.CreateDialog
-      Wizard.SetDesktopTitleAndIcon("dhcp-server")
+      Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
 
       dns_server_settings = DnsServer.Export
       ret = Sequencer.Run(aliases, sequence)

diff --git a/src/include/dhcp-server/wizards.rb b/src/include/dhcp-server/wizards.rb
@@ -140,7 +140,7 @@ def MainSequence
     # @return sequence result
     def DhcpAutoSequence
       Wizard.CreateDialog
-      Wizard.SetDesktopTitleAndIcon("dhcp-server")
+      Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
       Wizard.SetContentsButtons(
         "",
         VBox(),
@@ -172,7 +172,7 @@ def DhcpSequence
       }
 
       Wizard.CreateDialog
-      Wizard.SetDesktopTitleAndIcon("dhcp-server")
+      Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
       ret = Sequencer.Run(aliases, sequence)
 
       UI.CloseDialog