Hello community,
here is the log from the commit of package yast2-rdp for openSUSE:Factory checked in at 2019-07-31 14:24:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-rdp (Old)
and /work/SRC/openSUSE:Factory/.yast2-rdp.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-rdp"
Wed Jul 31 14:24:55 2019 rev:7 rq:717604 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-rdp/yast2-rdp.changes 2019-02-28 21:48:02.901406083 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-rdp.new.4126/yast2-rdp.changes 2019-07-31 14:24:56.482331741 +0200
@@ -1,0 +2,14 @@
+Mon Jul 22 10:05:05 UTC 2019 - knut.anderssen@suse.com
+
+- Remove network dependency completely (bsc#1142282)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:36:09 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-rdp-4.1.0.tar.bz2
New:
----
yast2-rdp-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-rdp.spec ++++++
--- /var/tmp/diff_new_pack.UzqU6K/_old 2019-07-31 14:24:56.926331238 +0200
+++ /var/tmp/diff_new_pack.UzqU6K/_new 2019-07-31 14:24:56.926331238 +0200
@@ -17,51 +17,51 @@
Name: yast2-rdp
-Version: 4.1.0
+Version: 4.2.1
Release: 0
Summary: Setup Remote Desktop Protocol service for remote administration
License: GPL-2.0-only
Group: System/YaST
-URL: https://www.suse.com
+Url: https://github.com/yast/yast-rdp
+
Source0: %{name}-%{version}.tar.bz2
-BuildArch: noarch
+
# SuSEFirewall2 replaced by firewalld (fate#323460)
-BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 4.0.39
-BuildRequires: yast2-devtools
-BuildRequires: yast2-network
-BuildRequires: yast2-testsuite
+BuildRequires: yast2-devtools >= 4.2.2
# for install task
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
# for test:unit
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
+
# SuSEFirewall2 replaced by firewalld (fate#323460)
Requires: yast2 >= 4.0.39
Requires: yast2-ruby-bindings
+BuildArch: noarch
+
%description
Configure RDP (remote desktop protocol) daemon to allow remote system administration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/rdp
-%{yast_yncludedir}/rdp/*
-%{yast_clientdir}/rdp.rb
-%{yast_clientdir}/rdp_*.rb
-%{yast_moduledir}/RDP.*
-%{yast_desktopdir}/rdp.desktop
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
%{yast_icondir}
%license COPYING
%doc %{yast_docdir}
++++++ yast2-rdp-4.1.0.tar.bz2 -> yast2-rdp-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/Dockerfile new/yast2-rdp-4.2.1/Dockerfile
--- old/yast2-rdp-4.1.0/Dockerfile 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/Dockerfile 2019-07-22 15:37:50.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-rdp-4.1.0/package/yast2-rdp.changes new/yast2-rdp-4.2.1/package/yast2-rdp.changes
--- old/yast2-rdp-4.1.0/package/yast2-rdp.changes 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/package/yast2-rdp.changes 2019-07-22 15:37:50.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Mon Jul 22 10:05:05 UTC 2019 - knut.anderssen@suse.com
+
+- Remove network dependency completely (bsc#1142282)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:36:09 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Feb 26 12:50:07 UTC 2019 - José Iván López González
- Version bump (bsc#1124009)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/package/yast2-rdp.spec new/yast2-rdp-4.2.1/package/yast2-rdp.spec
--- old/yast2-rdp-4.1.0/package/yast2-rdp.spec 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/package/yast2-rdp.spec 2019-07-22 15:37:50.000000000 +0200
@@ -12,52 +12,55 @@
# 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-rdp
-Version: 4.1.0
+Version: 4.2.1
Release: 0
License: GPL-2.0-only
Group: System/YaST
Summary: Setup Remote Desktop Protocol service for remote administration
-URL: https://www.suse.com
+Url: https://github.com/yast/yast-rdp
+
Source0: %{name}-%{version}.tar.bz2
-BuildArch: noarch
+
# SuSEFirewall2 replaced by firewalld (fate#323460)
BuildRequires: yast2 >= 4.0.39
-BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite yast2-network
-BuildRequires: yast2-devtools
+BuildRequires: update-desktop-files
+BuildRequires: yast2-devtools >= 4.2.2
# for install task
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
# for test:unit
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
+
# SuSEFirewall2 replaced by firewalld (fate#323460)
Requires: yast2 >= 4.0.39
Requires: yast2-ruby-bindings
+BuildArch: noarch
+
%description
Configure RDP (remote desktop protocol) daemon to allow remote system administration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/rdp
-%{yast_yncludedir}/rdp/*
-%{yast_clientdir}/rdp.rb
-%{yast_clientdir}/rdp_*.rb
-%{yast_moduledir}/RDP.*
-%{yast_desktopdir}/rdp.desktop
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
%{yast_icondir}
%license COPYING
%doc %{yast_docdir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/src/clients/rdp.rb new/yast2-rdp-4.2.1/src/clients/rdp.rb
--- old/yast2-rdp-4.1.0/src/clients/rdp.rb 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/src/clients/rdp.rb 2019-07-22 15:37:50.000000000 +0200
@@ -86,7 +86,7 @@
RDP.Read
Wizard.CreateDialog
- Wizard.SetDesktopIcon("remote")
+ Wizard.SetDesktopIcon("org.opensuse.yast.RDP")
Wizard.SetNextButton(:next, Label.FinishButton)
ret = RemoteMainDialog()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/src/clients/rdp_proposal.rb new/yast2-rdp-4.2.1/src/clients/rdp_proposal.rb
--- old/yast2-rdp-4.1.0/src/clients/rdp_proposal.rb 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/src/clients/rdp_proposal.rb 2019-07-22 15:37:50.000000000 +0200
@@ -44,7 +44,7 @@
# single dialog, no need to Export/Import
Wizard.CreateDialog
- Wizard.SetDesktopIcon("remote")
+ Wizard.SetDesktopIcon("org.opensuse.yast.RDP")
@result = RemoteMainDialog()
UI.CloseDialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/src/desktop/org.opensuse.yast.RDP.desktop new/yast2-rdp-4.2.1/src/desktop/org.opensuse.yast.RDP.desktop
--- old/yast2-rdp-4.1.0/src/desktop/org.opensuse.yast.RDP.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-rdp-4.2.1/src/desktop/org.opensuse.yast.RDP.desktop 2019-07-22 15:37:50.000000000 +0200
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=rdp
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=write
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=rdp
+X-SuSE-YaST-Keywords=remote,desktop,rdp,network,windows
+
+Icon=yast-remote-rdp
+Exec=xdg-su -c "/sbin/yast2 rdp"
+
+Name=YaST Remote Administration
+GenericName=Remote Administration (RDP)
+Comment=Configure RDP (Remote Desktop Protocol)
+StartupNotify=true
+X-KDE-SubstituteUID=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/src/desktop/rdp.desktop new/yast2-rdp-4.2.1/src/desktop/rdp.desktop
--- old/yast2-rdp-4.1.0/src/desktop/rdp.desktop 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/src/desktop/rdp.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=rdp
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=write
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=rdp
-X-SuSE-YaST-Keywords=remote,desktop,rdp,network,windows
-
-Icon=yast-remote-rdp
-Exec=xdg-su -c "/sbin/yast2 rdp"
-
-Name=Remote Administration (RDP)
-GenericName=Configure RDP (Remote Desktop Protocol)
-StartupNotify=true
-X-KDE-SubstituteUID=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/src/include/rdp/dialogs.rb new/yast2-rdp-4.2.1/src/include/rdp/dialogs.rb
--- old/yast2-rdp-4.1.0/src/include/rdp/dialogs.rb 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/src/include/rdp/dialogs.rb 2019-07-22 15:37:50.000000000 +0200
@@ -15,8 +15,6 @@
Yast.import "Label"
Yast.import "RDP"
Yast.import "Wizard"
-
- Yast.include include_target, "network/routines.rb"
end
# Remote administration dialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rdp-4.1.0/src/modules/RDP.rb new/yast2-rdp-4.2.1/src/modules/RDP.rb
--- old/yast2-rdp-4.1.0/src/modules/RDP.rb 2019-02-27 15:44:44.000000000 +0100
+++ new/yast2-rdp-4.2.1/src/modules/RDP.rb 2019-07-22 15:37:50.000000000 +0200
@@ -27,8 +27,6 @@
Yast.import "Progress"
Yast.import "Linuxrc"
- Yast.include self, "network/routines.rb"
-
# Allow remote administration
@allow_administration = false
@@ -91,33 +89,13 @@
# Update the SCR according to network settings
# @return true on success
def Write
- steps = [
- # Progress stage 1
- _("Write firewall settings"),
- # Progress stage 2
- _("Configure xrdp")
- ]
-
- if Mode.normal
- # Progress stage 3
- if @allow_administration
- steps = Builtins.add(steps, _("Restart the services"))
- else
- steps = Builtins.add(steps, _("Stop the services"))
- end
- end
+ start_write_progress
+ Progress.NextStage
+ write_firewall_settings
- caption = _("Saving Remote Administration (RDP) Configuration")
sl = 0 #100; //for testing
-
- Progress.New(caption, " ", Builtins.size(steps), steps, [], "")
-
- ProgressNextStage(_("Writing firewall settings..."))
- write_firewall_settings
Builtins.sleep(sl)
-
- ProgressNextStage(_("Configuring xrdp..."))
-
+ Progress.NextStage
if @allow_administration
# Enable xrdp
if !Service.Enable("xrdp")
@@ -134,13 +112,8 @@
Builtins.sleep(sl)
if Mode.normal
- if @allow_administration
- ProgressNextStage(_("Restarting the service..."))
- Service.Restart("xrdp")
- else
- ProgressNextStage(_("Stopping the service..."))
- Service.Stop("xrdp")
- end
+ Progress.NextStage
+ @allow_administration ? Service.Restart("xrdp") : Service.Stop("xrdp")
Builtins.sleep(sl)
Progress.NextStage
@@ -181,6 +154,40 @@
publish :function => :Read, :type => "boolean ()"
publish :function => :Write, :type => "boolean ()"
publish :function => :Summary, :type => "string ()"
+
+ private
+
+ # Convenience method to show the write progress dialog
+ def start_write_progress
+ caption = _("Saving Remote Administration (RDP) Configuration")
+
+ steps = progress_write_steps.map {|s| s[:step] }
+ titles = progress_write_steps.map {|s| s[:title] }
+ Progress.New(caption, " ", steps.size, steps, titles, "")
+ end
+
+ # Convenience method to obtain the write progress steps and titles
+ # descriptions
+ #
+ # @return [Array>] all the steps descriptions
+ def progress_write_steps
+ steps = []
+ steps << { step: _("Write firewall settings"), title: _("Writing firewall settings...") }
+ steps << { step: _("Configure xrdp"), title: _("Configuring xrdp...") }
+ steps << write_service_step if Mode.normal
+ steps
+ end
+
+ # Return the rpd service progress step description
+ #
+ # @return [Hash]
+ def write_service_step
+ if @allow_administration
+ { step: _("Restart the services"), title: _("Restarting the service...") }
+ else
+ { step: _("Stop the services"), title: _("Stopping the service...") }
+ end
+ end
end
RDP = RDPClass.new