Hello community,
here is the log from the commit of package yast2-dhcp-server for
openSUSE:Factory checked in at 2019-07-31 14:21:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server"
Wed Jul 31 14:21:55 2019 rev:57 rq:712899 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes
2018-12-31 09:43:43.582347464 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.4126/yast2-dhcp-server.changes
2019-07-31 14:21:56.954503279 +0200
@@ -1,0 +2,15 @@
+Mon Jul 1 16:18:15 UTC 2019 - Knut Anderssen <[email protected]>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip bind absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:28:42 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-4.1.5.tar.bz2
New:
----
yast2-dhcp-server-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.YwfokH/_old 2019-07-31 14:21:57.326502748 +0200
+++ /var/tmp/diff_new_pack.YwfokH/_new 2019-07-31 14:21:57.334502737 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dhcp-server
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,13 @@
Name: yast2-dhcp-server
-Version: 4.1.5
+Version: 4.2.1
Release: 0
+Summary: YaST2 - DHCP Server Configuration
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast-dhcp-server
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: docbook-xsl-stylesheets
@@ -29,15 +32,16 @@
BuildRequires: perl-Digest-SHA1
BuildRequires: perl-X500-DN
BuildRequires: perl-XML-Writer
+BuildRequires: perl-XML-Writer
BuildRequires: popt-devel
BuildRequires: sgml-skel
BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-dns-server
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
-# Yast2::ServiceWidget
-BuildRequires: yast2 >= 4.1.0
+# Fix old testsuite bind package absence mocks
+BuildRequires: yast2 >= 4.2.11
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
@@ -50,48 +54,40 @@
Requires: yast2-perl-bindings
# firewalld_wrapper.rb
Requires: yast2 >= 4.1.22
-
# DnsServerAPI::IsServiceConfigurableExternally
Requires: yast2-dns-server >= 2.13.16
-
-BuildArch: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - DHCP Server Configuration
-License: GPL-2.0-only
-Group: System/YaST
+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
++++++ yast2-dhcp-server-4.1.5.tar.bz2 -> yast2-dhcp-server-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/Dockerfile
new/yast2-dhcp-server-4.2.1/Dockerfile
--- old/yast2-dhcp-server-4.1.5/Dockerfile 2018-12-12 14:26:47.000000000
+0100
+++ new/yast2-dhcp-server-4.2.1/Dockerfile 2019-07-01 18:37:30.000000000
+0200
@@ -1,4 +1,4 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
yast2-dns-server
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.changes
new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.changes
--- old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.changes
2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.changes
2019-07-01 18:37:30.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Mon Jul 1 16:18:15 UTC 2019 - Knut Anderssen <[email protected]>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip bind absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:28:42 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Wed Dec 12 13:16:55 UTC 2018 - [email protected]
- Always use absolute path to binaries (bsc#1118291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.spec
new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.spec
--- old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.spec 2018-12-12
14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.spec 2019-07-01
18:37:30.000000000 +0200
@@ -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.1
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: yast2-devtools >= 3.1.10
-# Yast2::ServiceWidget
-BuildRequires: yast2 >= 4.1.0
+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 >= 4.2.2
+# Fix old testsuite bind package absence mocks
+BuildRequires: yast2 >= 4.2.11
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/Makefile.am
new/yast2-dhcp-server-4.2.1/src/Makefile.am
--- old/yast2-dhcp-server-4.1.5/src/Makefile.am 2018-12-12 14:26:47.000000000
+0100
+++ new/yast2-dhcp-server-4.2.1/src/Makefile.am 2019-07-01 18:37:30.000000000
+0200
@@ -40,7 +40,7 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/src/desktop/dhcp-server.desktop
new/yast2-dhcp-server-4.2.1/src/desktop/dhcp-server.desktop
--- old/yast2-dhcp-server-4.1.5/src/desktop/dhcp-server.desktop 2018-12-12
14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/desktop/dhcp-server.desktop 1970-01-01
01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=dhcp-server
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=dhcp-server
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstRequires=network,dhcp,lan,ip,address
-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
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/src/desktop/org.opensuse.yast.DHCPServer.desktop
new/yast2-dhcp-server-4.2.1/src/desktop/org.opensuse.yast.DHCPServer.desktop
---
old/yast2-dhcp-server-4.1.5/src/desktop/org.opensuse.yast.DHCPServer.desktop
1970-01-01 01:00:00.000000000 +0100
+++
new/yast2-dhcp-server-4.2.1/src/desktop/org.opensuse.yast.DHCPServer.desktop
2019-07-01 18:37:30.000000000 +0200
@@ -0,0 +1,27 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=dhcp-server
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=dhcp-server
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstRequires=network,dhcp,lan,ip,address
+X-SuSE-YaST-AutoInstSchema=dhcp-server.rnc
+
+Icon=yast-dhcp-server
+Exec=xdg-su -c "/sbin/yast2 dhcp-server"
+
+Name=YaST DHCP Server
+GenericName=DHCP Server
+Comment=Configure a DHCP server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-management.rb
new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-management.rb
---
old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-management.rb
2018-12-12 14:26:47.000000000 +0100
+++
new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-management.rb
2019-07-01 18:37:30.000000000 +0200
@@ -1091,7 +1091,7 @@
Label.CancelButton,
Label.OKButton
)
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
InitDNSServerConfiguration(@current_settings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-wizard.rb
new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-wizard.rb
--- old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-wizard.rb
2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-wizard.rb
2019-07-01 18:37:30.000000000 +0200
@@ -1384,7 +1384,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
dns_server_settings = DnsServer.Export
ret = Sequencer.Run(aliases, sequence)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/wizards.rb
new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/wizards.rb
--- old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/wizards.rb
2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/wizards.rb
2019-07-01 18:37:30.000000000 +0200
@@ -140,7 +140,7 @@
# @return sequence result
def DhcpAutoSequence
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
Wizard.SetContentsButtons(
"",
VBox(),
@@ -172,7 +172,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
ret = Sequencer.Run(aliases, sequence)
UI.CloseDialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/modules/DhcpServer.pm
new/yast2-dhcp-server-4.2.1/src/modules/DhcpServer.pm
--- old/yast2-dhcp-server-4.1.5/src/modules/DhcpServer.pm 2018-12-12
14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/modules/DhcpServer.pm 2019-07-01
18:37:30.000000000 +0200
@@ -1611,7 +1611,7 @@
Progress->NextStage ();
- $dns_server_available = DnsServerAPI->IsServiceConfigurableExternally();
+ $dns_server_available = (!Mode->test () &&
DnsServerAPI->IsServiceConfigurableExternally());
if ($dns_server_available) {
DnsServerAPI->Read();
}
@@ -1656,7 +1656,7 @@
my $ok = 1;
- $modified = $modified || FirewalldWrapper->is_modified ();
+ $modified = $modified || (!Mode->test () && FirewalldWrapper->is_modified
());
if (! $modified)
{
