From ce93c2274af9a27e6d4adbf336b2b4f48150fc2f Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 31 May 2019 14:19:41 +0200 Subject: [PATCH 1/7] Replace GenericName with Comment for descriptions --- ...p-server.desktop => org.openSUSE.YaST.DHCPServer.desktop} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename src/desktop/{dhcp-server.desktop => org.openSUSE.YaST.DHCPServer.desktop} (88%) diff --git a/src/desktop/dhcp-server.desktop b/src/desktop/org.openSUSE.YaST.DHCPServer.desktop similarity index 88% rename from src/desktop/dhcp-server.desktop rename to src/desktop/org.openSUSE.YaST.DHCPServer.desktop index 4b3bf01..879a9d3 100644 --- a/src/desktop/dhcp-server.desktop +++ b/src/desktop/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 From df79fa63b03e0b8b98acdf66f109997f69fd1106 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 31 May 2019 14:21:29 +0200 Subject: [PATCH 2/7] Add metadata into packages --- src/Makefile.am | 2 +- src/include/dhcp-server/dns-server-management.rb | 2 +- src/include/dhcp-server/dns-server-wizard.rb | 2 +- src/include/dhcp-server/wizards.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 132858a..ec5558b 100644 --- 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/include/dhcp-server/dns-server-management.rb b/src/include/dhcp-server/dns-server-management.rb index 4b15962..3aa9166 100644 --- 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 index c131f28..fd21338 100644 --- 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 index de9d382..f5f44b5 100644 --- 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 From 3f785db246ded2f5d2b577ad84239942e0b9d826 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 31 May 2019 14:22:13 +0200 Subject: [PATCH 3/7] Revamp spec --- package/yast2-dhcp-server.spec | 63 ++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec index db4211f..b694fc8 100644 --- 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 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 From af266dd64643060002cf24b690d3e00e84cc9ed9 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Fri, 31 May 2019 14:43:06 +0200 Subject: [PATCH 4/7] Version bump --- package/yast2-dhcp-server.changes | 8 ++++++++ package/yast2-dhcp-server.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes index 32d1728..61227aa 100644 --- 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 + +- 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 index b694fc8..0d833db 100644 --- a/package/yast2-dhcp-server.spec +++ b/package/yast2-dhcp-server.spec @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 4.1.5 +Version: 4.2.0 Release: 0 Summary: YaST2 - DHCP Server Configuration Group: System/YaST From 0fcbb1ad6ea721dbe67fb01fd7b4413b702beae2 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 2 Jun 2019 02:27:52 +0200 Subject: [PATCH 5/7] Change desktop name --- src/Makefile.am | 2 +- src/include/dhcp-server/dns-server-management.rb | 2 +- src/include/dhcp-server/dns-server-wizard.rb | 2 +- src/include/dhcp-server/wizards.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ec5558b..47df8c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,7 @@ schemafiles_DATA = \ autoyast-rnc/dhcp-server.rnc desktop_DATA = \ - desktop/org.openSUSE.YaST.DHCPServer.desktop + desktop/org.opensuse.yast.DHCPServer.desktop symbolicdir = @icondir@/hicolor/symbolic/apps symbolic_DATA = \ diff --git a/src/include/dhcp-server/dns-server-management.rb b/src/include/dhcp-server/dns-server-management.rb index 3aa9166..60e801c 100644 --- 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("org.openSUSE.YaST.DHCPServer") + 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 index fd21338..35d4caa 100644 --- 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("org.openSUSE.YaST.DHCPServer") + 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 index f5f44b5..9207703 100644 --- 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("org.openSUSE.YaST.DHCPServer") + Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer") Wizard.SetContentsButtons( "", VBox(), @@ -172,7 +172,7 @@ def DhcpSequence } Wizard.CreateDialog - Wizard.SetDesktopTitleAndIcon("org.openSUSE.YaST.DHCPServer") + Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer") ret = Sequencer.Run(aliases, sequence) UI.CloseDialog From 94a27bcb514b4fa4a268b3f39c66a17e41e0fa79 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 2 Jun 2019 02:46:19 +0200 Subject: [PATCH 6/7] Change desktop name --- ...ST.DHCPServer.desktop => org.opensuse.yast.DHCPServer.desktop} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/desktop/{org.openSUSE.YaST.DHCPServer.desktop => org.opensuse.yast.DHCPServer.desktop} (100%) diff --git a/src/desktop/org.openSUSE.YaST.DHCPServer.desktop b/src/desktop/org.opensuse.yast.DHCPServer.desktop similarity index 100% rename from src/desktop/org.openSUSE.YaST.DHCPServer.desktop rename to src/desktop/org.opensuse.yast.DHCPServer.desktop From 882ea2c9d4392d0cf6c72cb987346f97e3c699dd Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Mon, 3 Jun 2019 15:01:30 +0200 Subject: [PATCH 7/7] Change yast-builtools/devtools dep version --- package/yast2-dhcp-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec index 0d833db..95c32c7 100644 --- a/package/yast2-dhcp-server.spec +++ b/package/yast2-dhcp-server.spec @@ -39,7 +39,7 @@ BuildRequires: update-desktop-files BuildRequires: yast2-perl-bindings BuildRequires: yast2-testsuite BuildRequires: yast2-dns-server -BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-devtools >= 4.2.2 # Yast2::ServiceWidget BuildRequires: yast2 >= 4.1.0 BuildRequires: rubygem(%rb_default_ruby_abi:rspec)