Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2014-07-31 07:41:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ftp-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2013-11-15 14:24:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes 2014-07-31 07:41:55.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 30 09:35:28 CEST 2014 - schubi@suse.de + +- Taking vsftpd ftp-server default in autoyast configuration module + (bnc#888212) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-3.1.1.tar.bz2 New: ---- yast2-ftp-server-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.XXJIas/_old 2014-07-31 07:41:55.000000000 +0200 +++ /var/tmp/diff_new_pack.XXJIas/_new 2014-07-31 07:41:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ftp-server # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,7 +17,7 @@ Name: yast2-ftp-server -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-inetd BuildRequires: yast2-testsuite ++++++ yast2-ftp-server-3.1.1.tar.bz2 -> yast2-ftp-server-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.1/VERSION new/yast2-ftp-server-3.1.2/VERSION --- old/yast2-ftp-server-3.1.1/VERSION 2013-11-15 12:59:11.000000000 +0100 +++ new/yast2-ftp-server-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.1/package/yast2-ftp-server.changes new/yast2-ftp-server-3.1.2/package/yast2-ftp-server.changes --- old/yast2-ftp-server-3.1.1/package/yast2-ftp-server.changes 2013-11-15 12:59:11.000000000 +0100 +++ new/yast2-ftp-server-3.1.2/package/yast2-ftp-server.changes 2014-07-30 09:49:43.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 30 09:35:28 CEST 2014 - schubi@suse.de + +- Taking vsftpd ftp-server default in autoyast configuration module + (bnc#888212) +- 3.1.2 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger@suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.1/package/yast2-ftp-server.spec new/yast2-ftp-server-3.1.2/package/yast2-ftp-server.spec --- old/yast2-ftp-server-3.1.1/package/yast2-ftp-server.spec 2013-11-15 12:59:11.000000000 +0100 +++ new/yast2-ftp-server-3.1.2/package/yast2-ftp-server.spec 2014-07-30 09:49:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ftp-server -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ Requires: yast2 >= 2.21.22 Requires: yast2-inetd BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite yast2-inetd -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildArchitectures: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.1/src/include/ftp-server/wid_functions.rb new/yast2-ftp-server-3.1.2/src/include/ftp-server/wid_functions.rb --- old/yast2-ftp-server-3.1.1/src/include/ftp-server/wid_functions.rb 2013-11-04 16:13:57.000000000 +0100 +++ new/yast2-ftp-server-3.1.2/src/include/ftp-server/wid_functions.rb 2014-07-30 09:49:43.000000000 +0200 @@ -452,17 +452,21 @@ UI.ChangeWidget(Id("pure_item"), :Enabled, false) UI.ChangeWidget(Id("vs_item"), :Enabled, false) else - UI.ChangeWidget(Id("pure_item"), :Enable, false) + UI.ChangeWidget(Id("pure_item"), :Enabled, false) UI.ChangeWidget(Id("vs_item"), :Enabled, false) end if !Mode.normal - if FtpServer.vsftpd_edit + # Autoyast configuration module does not take care about installed + # packages (installed ftp-servers). As we are using vsftpd + # in autoyast (SLES) only, we are disabling the selection of + # different ftp servers. (bnc#888212) + if FtpServer.vsftpd_edit || Mode.config UI.ChangeWidget(Id("vs_item"), :Value, true) else UI.ChangeWidget(Id("pure_item"), :Value, true) end - UI.ChangeWidget(Id("pure_item"), :Enable, false) + UI.ChangeWidget(Id("pure_item"), :Enabled, false) UI.ChangeWidget(Id("vs_item"), :Enabled, false) end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org