Hello community,
here is the log from the commit of package yast2-instserver for
openSUSE:Factory checked in at 2019-08-01 15:48:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-instserver (Old)
and /work/SRC/openSUSE:Factory/.yast2-instserver.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-instserver"
Thu Aug 1 15:48:35 2019 rev:59 rq:716733 version:4.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-instserver/yast2-instserver.changes
2019-01-08 12:19:46.780846570 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-instserver.new.4126/yast2-instserver.changes
2019-08-01 15:48:41.241738645 +0200
@@ -1,0 +2,22 @@
+Fri Jul 19 06:59:17 UTC 2019 - Ladislav Slezák <[email protected]>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
+Thu Jul 18 09:10:01 UTC 2019 - David Diaz <[email protected]>
+
+- Do not crash when starting the Installation Server (bsc#1141963).
+- 4.2.1
+
+-------------------------------------------------------------------
+
+Fri May 31 12:31:14 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-4.1.5.tar.bz2
New:
----
yast2-instserver-4.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.nAHLxj/_old 2019-08-01 15:48:42.085738531 +0200
+++ /var/tmp/diff_new_pack.nAHLxj/_new 2019-08-01 15:48:42.089738530 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-instserver
#
-# 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,35 +17,32 @@
Name: yast2-instserver
-Version: 4.1.5
+Version: 4.2.2
Release: 0
+Summary: YaST2 - Installation Server Configuration and Management
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-instserver
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Source1: inst_server.conf.in
-Url: http://github.com/yast/yast-instserver
-
+BuildRequires: update-desktop-files
# Yast2::Systemd::Socket
BuildRequires: yast2 >= 4.1.3
-Requires: yast2 >= 4.1.3
-
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
+Requires: yast2 >= 4.1.3
+Requires: yast2-ruby-bindings >= 1.0.0
+
# file conflict, move of ag_content
Conflicts: yast2 <= 3.3.4
-BuildArch: noarch
-
-Requires: yast2-ruby-bindings >= 1.0.0
-
Obsoletes: yast2-instserver-devel-doc
-Summary: YaST2 - Installation Server Configuration and Management
-License: GPL-2.0-or-later
-Group: System/YaST
+BuildArch: noarch
%description
This package allows you to configure an installation server suitable
@@ -53,35 +50,31 @@
NFS sources are supported.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
install -D %{SOURCE1} %{buildroot}/etc/apache2/conf.d/inst_server.conf.in
mkdir -p %{buildroot}/etc/YaST2/instserver
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/instserver
-%{yast_yncludedir}/instserver/*
-%{yast_clientdir}/instserver.rb
-%{yast_moduledir}/Instserver.*
-%{yast_desktopdir}/instserver.desktop
-%{yast_scrconfdir}/*
-%{yast_agentdir}/ag_*
-/etc/YaST2/instserver
-/etc/apache2/conf.d/inst_server.conf.in
-%dir /etc/apache2
-%dir /etc/apache2/conf.d
-%dir %{yast_docdir}
-%doc %{yast_docdir}/CONTRIBUTING.md
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
+%{_sysconfdir}/YaST2/instserver
+%{_sysconfdir}/apache2
%license COPYING
-%doc %{yast_docdir}/README.md
-%{_datadir}/icons/*
+%doc %{yast_docdir}
+%{yast_icondir}
%changelog
++++++ yast2-instserver-4.1.5.tar.bz2 -> yast2-instserver-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.1.5/Dockerfile
new/yast2-instserver-4.2.2/Dockerfile
--- old/yast2-instserver-4.1.5/Dockerfile 2018-12-04 14:50:55.000000000
+0100
+++ new/yast2-instserver-4.2.2/Dockerfile 2019-07-19 09:20:36.000000000
+0200
@@ -1,3 +1,3 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-instserver-4.1.5/package/yast2-instserver.changes
new/yast2-instserver-4.2.2/package/yast2-instserver.changes
--- old/yast2-instserver-4.1.5/package/yast2-instserver.changes 2018-12-04
14:50:55.000000000 +0100
+++ new/yast2-instserver-4.2.2/package/yast2-instserver.changes 2019-07-19
09:20:36.000000000 +0200
@@ -1,4 +1,26 @@
-------------------------------------------------------------------
+Fri Jul 19 06:59:17 UTC 2019 - Ladislav Slezák <[email protected]>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
+Thu Jul 18 09:10:01 UTC 2019 - David Diaz <[email protected]>
+
+- Do not crash when starting the Installation Server (bsc#1141963).
+- 4.2.1
+
+-------------------------------------------------------------------
+
+Fri May 31 12:31:14 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Dec 4 11:07:15 UTC 2018 - [email protected]
- always use absolute path to binaries (bsc#1118291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.1.5/package/yast2-instserver.spec
new/yast2-instserver-4.2.2/package/yast2-instserver.spec
--- old/yast2-instserver-4.1.5/package/yast2-instserver.spec 2018-12-04
14:50:55.000000000 +0100
+++ new/yast2-instserver-4.2.2/package/yast2-instserver.spec 2019-07-19
09:20:36.000000000 +0200
@@ -12,40 +12,37 @@
# 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-instserver
-Version: 4.1.5
+Version: 4.2.2
Release: 0
+Summary: YaST2 - Installation Server Configuration and Management
+Url: https://github.com/yast/yast-instserver
+Group: System/YaST
+License: GPL-2.0-or-later
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Source1: inst_server.conf.in
-url: http://github.com/yast/yast-instserver
-Group: System/YaST
-License: GPL-2.0-or-later
-
+BuildRequires: update-desktop-files
# Yast2::Systemd::Socket
BuildRequires: yast2 >= 4.1.3
-Requires: yast2 >= 4.1.3
-
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
+Requires: yast2 >= 4.1.3
+Requires: yast2-ruby-bindings >= 1.0.0
+
# file conflict, move of ag_content
Conflicts: yast2 <= 3.3.4
-BuildArch: noarch
-
-Requires: yast2-ruby-bindings >= 1.0.0
-
Obsoletes: yast2-instserver-devel-doc
-Summary: YaST2 - Installation Server Configuration and Management
+BuildArch: noarch
%description
This package allows you to configure an installation server suitable
@@ -53,34 +50,32 @@
NFS sources are supported.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
install -D %{SOURCE1} %{buildroot}/etc/apache2/conf.d/inst_server.conf.in
mkdir -p %{buildroot}/etc/YaST2/instserver
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/instserver
-%{yast_yncludedir}/instserver/*
-%{yast_clientdir}/instserver.rb
-%{yast_moduledir}/Instserver.*
-%{yast_desktopdir}/instserver.desktop
-%{yast_scrconfdir}/*
-%{yast_agentdir}/ag_*
-/etc/YaST2/instserver
-/etc/apache2/conf.d/inst_server.conf.in
-%dir /etc/apache2
-%dir /etc/apache2/conf.d
-%dir %{yast_docdir}
-%doc %{yast_docdir}/CONTRIBUTING.md
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
+%{_sysconfdir}/YaST2/instserver
+%{_sysconfdir}/apache2
%license COPYING
-%doc %{yast_docdir}/README.md
-%{_datadir}/icons/*
+%doc %{yast_docdir}
+%{yast_icondir}
+
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-instserver-4.1.5/src/desktop/instserver.desktop
new/yast2-instserver-4.2.2/src/desktop/instserver.desktop
--- old/yast2-instserver-4.1.5/src/desktop/instserver.desktop 2018-12-04
14:50:55.000000000 +0100
+++ new/yast2-instserver-4.2.2/src/desktop/instserver.desktop 1970-01-01
01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=instserver
-
-X-SuSE-YaST-Group=Misc
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-Keywords=installation,server
-
-Icon=yast-instserver
-Exec=xdg-su -c "/sbin/yast2 instserver"
-
-Name=Installation Server
-GenericName=Configure and manage installation servers
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-instserver-4.1.5/src/desktop/org.opensuse.yast.InstServer.desktop
new/yast2-instserver-4.2.2/src/desktop/org.opensuse.yast.InstServer.desktop
--- old/yast2-instserver-4.1.5/src/desktop/org.opensuse.yast.InstServer.desktop
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-instserver-4.2.2/src/desktop/org.opensuse.yast.InstServer.desktop
2019-07-19 09:20:36.000000000 +0200
@@ -0,0 +1,23 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=instserver
+
+X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-Keywords=installation,server
+
+Icon=yast-instserver
+Exec=xdg-su -c "/sbin/yast2 instserver"
+
+Name=YaST Installation Server
+GenericName=Installation Server
+Comment=Configure and manage installation servers
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-instserver-4.1.5/src/include/instserver/wizards.rb
new/yast2-instserver-4.2.2/src/include/instserver/wizards.rb
--- old/yast2-instserver-4.1.5/src/include/instserver/wizards.rb
2018-12-04 14:50:55.000000000 +0100
+++ new/yast2-instserver-4.2.2/src/include/instserver/wizards.rb
2019-07-19 09:20:36.000000000 +0200
@@ -130,7 +130,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("instserver")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.InstServer")
ret = Sequencer.Run(aliases, sequence)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.1.5/src/modules/Instserver.rb
new/yast2-instserver-4.2.2/src/modules/Instserver.rb
--- old/yast2-instserver-4.1.5/src/modules/Instserver.rb 2018-12-04
14:50:55.000000000 +0100
+++ new/yast2-instserver-4.2.2/src/modules/Instserver.rb 2019-07-19
09:20:36.000000000 +0200
@@ -14,7 +14,7 @@
module Yast
class InstserverClass < Module
- NFS_SERVER_SEVICE = "nfs-server".freeze
+ NFS_SERVER_SERVICE = "nfs-server".freeze
def main
textdomain "instserver"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.1.5/test/Instserver_test.rb
new/yast2-instserver-4.2.2/test/Instserver_test.rb
--- old/yast2-instserver-4.1.5/test/Instserver_test.rb 2018-12-04
14:50:55.000000000 +0100
+++ new/yast2-instserver-4.2.2/test/Instserver_test.rb 2019-07-19
09:20:36.000000000 +0200
@@ -8,7 +8,48 @@
describe "Yast::Instserver" do
subject { Yast::Instserver }
-
+
+ describe "#SetupNFS" do
+ let(:nfs_service_status) { 0 }
+
+ before do
+ allow(Yast::Package).to receive(:InstallAll).and_return(true)
+ allow(Yast::Ops).to receive(:greater_than).and_return(false)
+ allow(Yast::Service).to receive(:Enable)
+ allow(Yast::Service).to receive(:Reload)
+ allow(Yast::Service).to receive(:Start)
+ allow(Yast::Service).to
receive(:Status).with("nfs-server").and_return(nfs_service_status)
+ allow(Y2Firewall::Firewalld).to receive(:read)
+ allow(Y2Firewall::Firewalld).to receive(:write)
+ end
+
+ it "enables nfs-server service" do
+ expect(Yast::Service).to receive(:Enable).with("nfs-server")
+
+ subject.SetupNFS("/tmp", {})
+ end
+
+ context "when nfs-service is already active" do
+ let(:nfs_service_status) { 0 }
+
+ it "reload it" do
+ expect(Yast::Service).to receive(:Reload).with("nfs-server")
+
+ subject.SetupNFS("/tmp", {})
+ end
+ end
+
+ context "when nfs-service is not active yet" do
+ let(:nfs_service_status) { -1 }
+
+ it "start it" do
+ expect(Yast::Service).to receive(:Start).with("nfs-server")
+
+ subject.SetupNFS("/tmp", {})
+ end
+ end
+ end
+
describe "#Modified" do
it "returns false initially" do
expect(subject.Modified).to eq false
