Hello community, here is the log from the commit of package yast2-proxy for openSUSE:Factory checked in at 2019-07-31 14:23:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-proxy (Old) and /work/SRC/openSUSE:Factory/.yast2-proxy.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-proxy" Wed Jul 31 14:23:18 2019 rev:18 rq:714786 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-proxy/yast2-proxy.changes 2018-12-31 09:42:22.830413567 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-proxy.new.4126/yast2-proxy.changes 2019-07-31 14:23:20.806435525 +0200 @@ -1,0 +2,14 @@ +Thu Jul 4 13:49:19 UTC 2019 - Imobach Gonzalez Sosa <[email protected]> + +- Fix 'proxy' behaviour when running in firstboot (bsc#1140199). +- 4.2.1 + +------------------------------------------------------------------- +Fri May 31 12:35:58 UTC 2019 - Stasiek Michalski <[email protected]> + +- Add metainfo (fate#319035) +- Revamp spec +- Replace GenericName with Comment +- 4.2.0 + +------------------------------------------------------------------- Old: ---- yast2-proxy-4.1.0.tar.bz2 New: ---- yast2-proxy-4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-proxy.spec ++++++ --- /var/tmp/diff_new_pack.59NKTp/_old 2019-07-31 14:23:21.270435260 +0200 +++ /var/tmp/diff_new_pack.59NKTp/_new 2019-07-31 14:23:21.274435258 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-proxy # -# 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,58 +17,55 @@ Name: yast2-proxy -Version: 4.1.0 +Version: 4.2.1 Release: 0 +Summary: YaST2 - Proxy Configuration +License: GPL-2.0-or-later +Group: System/YaST +Url: https://github.com/yast/yast-proxy -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 BuildRequires: update-desktop-files -BuildRequires: yast2-buildtools >= 3.1.10 +BuildRequires: yast2 +BuildRequires: yast2-buildtools >= 4.2.2 BuildRequires: rubygem(rspec) BuildRequires: rubygem(yast-rake) -BuildRequires: yast2 Requires: yast2 +Requires: yast2-ruby-bindings >= 1.0.0 # we split off that one Conflicts: yast2-network < 2.22.6 BuildArch: noarch -Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: YaST2 - Proxy Configuration -License: GPL-2.0-or-later -Group: System/YaST -Url: http://en.opensuse.org/Portal:YaST - %description This package contains the YaST2 component for proxy configuration. %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) -%{yast_clientdir}/*.rb -%{yast_libdir}/proxy -%{yast_moduledir}/*.rb -%{yast_yncludedir}/proxy -%{yast_desktopdir}/*.desktop -%{yast_scrconfdir}/*.scr -%{yast_schemadir}/autoyast/rnc/proxy.rnc +%{yast_clientdir} +%{yast_libdir} +%{yast_moduledir} +%{yast_yncludedir} +%{yast_desktopdir} +%{yast_metainfodir} +%{yast_scrconfdir} +%{yast_schemadir} %{yast_icondir} %license COPYING - %doc %{yast_docdir} %changelog ++++++ yast2-proxy-4.1.0.tar.bz2 -> yast2-proxy-4.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/Dockerfile new/yast2-proxy-4.2.1/Dockerfile --- old/yast2-proxy-4.1.0/Dockerfile 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/Dockerfile 2019-07-12 09:54:53.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-proxy-4.1.0/package/yast2-proxy.changes new/yast2-proxy-4.2.1/package/yast2-proxy.changes --- old/yast2-proxy-4.1.0/package/yast2-proxy.changes 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/package/yast2-proxy.changes 2019-07-12 09:54:53.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Jul 4 13:49:19 UTC 2019 - Imobach Gonzalez Sosa <[email protected]> + +- Fix 'proxy' behaviour when running in firstboot (bsc#1140199). +- 4.2.1 + +------------------------------------------------------------------- +Fri May 31 12:35:58 UTC 2019 - Stasiek Michalski <[email protected]> + +- Add metainfo (fate#319035) +- Revamp spec +- Replace GenericName with Comment +- 4.2.0 + +------------------------------------------------------------------- Wed Dec 5 11:06:17 UTC 2018 - [email protected] - always use absolute path to binaries (bsc#1118291) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/package/yast2-proxy.spec new/yast2-proxy-4.2.1/package/yast2-proxy.spec --- old/yast2-proxy-4.1.0/package/yast2-proxy.spec 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/package/yast2-proxy.spec 2019-07-12 09:54:53.000000000 +0200 @@ -12,63 +12,60 @@ # 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-proxy -Version: 4.1.0 +Version: 4.2.1 Release: 0 +Summary: YaST2 - Proxy Configuration +License: GPL-2.0-or-later +Group: System/YaST +Url: https://github.com/yast/yast-proxy -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 BuildRequires: update-desktop-files -BuildRequires: yast2-buildtools >= 3.1.10 +BuildRequires: yast2-buildtools >= 4.2.2 BuildRequires: rubygem(rspec) BuildRequires: rubygem(yast-rake) - BuildRequires: yast2 + Requires: yast2 +Requires: yast2-ruby-bindings >= 1.0.0 # we split off that one Conflicts: yast2-network < 2.22.6 BuildArch: noarch -Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: YaST2 - Proxy Configuration -License: GPL-2.0-or-later -Group: System/YaST -Url: http://en.opensuse.org/Portal:YaST - %description This package contains the YaST2 component for proxy configuration. %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) -%{yast_clientdir}/*.rb -%{yast_libdir}/proxy -%{yast_moduledir}/*.rb -%{yast_yncludedir}/proxy -%{yast_desktopdir}/*.desktop -%{yast_scrconfdir}/*.scr -%{yast_schemadir}/autoyast/rnc/proxy.rnc +%{yast_clientdir} +%{yast_libdir} +%{yast_moduledir} +%{yast_yncludedir} +%{yast_desktopdir} +%{yast_metainfodir} +%{yast_scrconfdir} +%{yast_schemadir} %{yast_icondir} %license COPYING - %doc %{yast_docdir} %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/desktop/org.opensuse.yast.Proxy.desktop new/yast2-proxy-4.2.1/src/desktop/org.opensuse.yast.Proxy.desktop --- old/yast2-proxy-4.1.0/src/desktop/org.opensuse.yast.Proxy.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-4.2.1/src/desktop/org.opensuse.yast.Proxy.desktop 2019-07-12 09:54:53.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-HasReadOnlyMode=true +X-SuSE-YaST-Call=proxy + +X-SuSE-YaST-Group=Net_advanced +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=proxy +X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=proxy.rnc +X-SuSE-YaST-Keywords=network,internet,access + +Icon=yast-proxy +Exec=xdg-su -c "/sbin/yast2 proxy" + +Name=YaST Proxy +GenericName=Proxy +Comment=Configure a proxy +StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/desktop/proxy.desktop new/yast2-proxy-4.2.1/src/desktop/proxy.desktop --- old/yast2-proxy-4.1.0/src/desktop/proxy.desktop 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/src/desktop/proxy.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-HasReadOnlyMode=true -X-SuSE-YaST-Call=proxy - -X-SuSE-YaST-Group=Net_advanced -X-SuSE-YaST-Argument= -X-SuSE-YaST-RootOnly=true -X-SuSE-YaST-AutoInst=all -X-SuSE-YaST-Geometry= -X-SuSE-YaST-SortKey= -X-SuSE-YaST-AutoInstResource=proxy -X-SuSE-YaST-AutoInstClonable=true -X-SuSE-YaST-AutoInstSchema=proxy.rnc -X-SuSE-YaST-Keywords=network,internet,access - -Icon=yast-proxy -Exec=xdg-su -c "/sbin/yast2 proxy" - -Name=Proxy -GenericName=Configure a proxy -StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/include/proxy/dialogs.rb new/yast2-proxy-4.2.1/src/include/proxy/dialogs.rb --- old/yast2-proxy-4.1.0/src/include/proxy/dialogs.rb 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/src/include/proxy/dialogs.rb 2019-07-12 09:54:53.000000000 +0200 @@ -376,7 +376,7 @@ # If modified, ask for confirmation # @return true if abort is confirmed def ReallyAbortCond - !modified || Popup.ReallyAbort(true) + (!modified || installation?) || Popup.ReallyAbort(true) end # Proxy dialog @@ -541,11 +541,9 @@ contents, help, Label.BackButton, - Label.FinishButton + Label.NextButton ) - Wizard.SetNextButton(:next, Label.OKButton) - Wizard.SetAbortButton(:abort, Label.CancelButton) - Wizard.HideBackButton + adjust_wizard_buttons unless installation? # #103841, relaxed. now avoiding only quotes # #337048 allow using space as well @@ -752,5 +750,24 @@ deep_copy(ret) end + + private + + # Sets OK/Cancel wizard buttons + def adjust_wizard_buttons + Wizard.SetNextButton(:next, Label.OKButton) + Wizard.SetAbortButton(:abort, Label.CancelButton) + Wizard.HideBackButton + end + + # Determines whether running in installation mode + # + # We do not use Stage.initial because of firstboot, which runs in 'installation' mode + # but in 'firstboot' stage. + # + # @return [Boolean] Boolean if running in installation or update mode + def installation? + Mode.installation || Mode.update + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/lib/proxy/auto_client.rb new/yast2-proxy-4.2.1/src/lib/proxy/auto_client.rb --- old/yast2-proxy-4.1.0/src/lib/proxy/auto_client.rb 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/src/lib/proxy/auto_client.rb 2019-07-12 09:54:53.000000000 +0200 @@ -53,7 +53,7 @@ # Change configuration (run AutoSequence) elsif @func == "Change" Wizard.CreateDialog - Wizard.SetDesktopTitleAndIcon("proxy") + Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Proxy") @ret = ProxyMainDialog(true) UI.CloseDialog # return required package list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/lib/proxy/client.rb new/yast2-proxy-4.2.1/src/lib/proxy/client.rb --- old/yast2-proxy-4.1.0/src/lib/proxy/client.rb 2018-12-05 12:22:55.000000000 +0100 +++ new/yast2-proxy-4.2.1/src/lib/proxy/client.rb 2019-07-12 09:54:53.000000000 +0200 @@ -148,8 +148,7 @@ Proxy.Read Wizard.CreateDialog - Wizard.SetDesktopTitleAndIcon("proxy") - Wizard.SetNextButton(:next, Label.FinishButton) + Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Proxy") # main ui function ret = ProxyMainDialog(true)
