Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Thu May 31 21:29:18 CEST 2007.
--------
--- yast2-samba-client/yast2-samba-client.changes 2007-05-17 13:52:00.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2007-05-31 10:26:51.349014000 +0200
@@ -1,0 +2,7 @@
+Wed May 30 09:27:44 CEST 2007 - jsuchome@suse.cz
+
+- added help text for DHCP support (F120090)
+- removed Browse button (#240045)
+- 2.15.7
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.15.6.tar.bz2
New:
----
yast2-samba-client-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.M10797/_old 2007-05-31 21:28:47.000000000 +0200
+++ /var/tmp/diff_new_pack.M10797/_new 2007-05-31 21:28:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.15.6)
+# spec file for package yast2-samba-client (Version 2.15.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-samba-client
-Version: 2.15.6
+Version: 2.15.7
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.15.6.tar.bz2
+Source0: yast2-samba-client-2.15.7.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-kerberos-client
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-samba-client-2.15.6
+%setup -n yast2-samba-client-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,10 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog
+* Wed May 30 2007 - jsuchome@suse.cz
+- added help text for DHCP support (F120090)
+- removed Browse button (#240045)
+- 2.15.7
* Thu May 17 2007 - jsuchome@suse.cz
- fix deleting shares from smb.conf (#264834)
- 2.15.6
++++++ yast2-samba-client-2.15.6.tar.bz2 -> yast2-samba-client-2.15.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/dialogs.ycp new/yast2-samba-client-2.15.7/src/dialogs.ycp
--- old/yast2-samba-client-2.15.6/src/dialogs.ycp 2007-03-27 11:34:01.000000000 +0200
+++ new/yast2-samba-client-2.15.7/src/dialogs.ycp 2007-05-31 10:16:54.000000000 +0200
@@ -45,7 +45,9 @@
boolean dhcp_support = Samba::GetDHCP ();
// help text, do not translate 'winbind uid', 'winbind gid'
- string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).");
+ string help_text = _("<p>Specify the <b>range</b> for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).</p>")
+
+ + DHCPSupportHelp ();
UI::OpenDialog (`opt (`decorated), `HBox (
`HWeight (1, `RichText (`id (`help), help_text)),
@@ -213,12 +215,7 @@
`TextEntry(`id(`workgroup), (Stage::cont() ?
_("&Domain") :
// translators: text entry label
- _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()),
- `VBox (
- `Label(""),
- // translators: push button label
- `PushButton(`id(`browse), _("Br&owse..."))
- )
+ _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm())
),
status_term,
winbind_term,
@@ -267,9 +264,6 @@
Wizard::HideBackButton();
check_domain_membership (Samba::GetWorkgroupOrRealm());
}
- if (Mode::config ()) {
- UI::ChangeWidget (`id(`browse), `Enabled, false);
- }
any ret = nil;
while(true) {
@@ -436,15 +430,6 @@
"));
}
break;
- } else if (ret == `browse) {
-
- string new_workgroup = BrowseNeighbours( Stage::cont() );
- if( new_workgroup != nil && new_workgroup != "" ) {
- // fill in the new workgroup name
- UI::ChangeWidget( `id(`workgroup), `Value, new_workgroup );
- check_domain_membership (new_workgroup);
- }
- continue;
} else if (ret == `back ) {
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/helps.ycp new/yast2-samba-client-2.15.7/src/helps.ycp
--- old/yast2-samba-client-2.15.6/src/helps.ycp 2006-10-30 16:33:52.000000000 +0100
+++ new/yast2-samba-client-2.15.7/src/helps.ycp 2007-05-30 09:14:53.000000000 +0200
@@ -42,9 +42,7 @@
"MembershipDialog_nocont" : _("<p><b><big>Selecting Windows Domain Membership</big></b></p>")
/* translators: Samba workgroup dialog help 1/3 */
+ _("<p>A Linux client can be a member of a workgroup, NT domain, or Active Directory domain.
-Here, specify the name of the membership. <b>Browse</b>
-presents the list of all workgroups and domains found in the
-network.</p>
+Here, specify the name of the membership.</p>
") +
/* Samba role dialog help 2/3 */
@@ -60,8 +58,7 @@
/* translators: Samba membership dialog help title (installation) */
"MembershipDialog_cont" : _("<p><b><big>Selecting Windows Domain Membership</big></b></p>")
/* translators: Samba membership dialog help 1/2 (installation) */
-+ _("<p>Specify the name of the NT or Active Directory domain. <b>Browse</b>
-presents the list of all domains found in the network.</p>
++ _("<p>Specify the name of the NT or Active Directory domain.</p>
")
/* translators: Samba membership dialog help 2/2 (installation) */
+ _("<p>When you press <b>Next</b>, the system verifies the domain and
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/routines.ycp new/yast2-samba-client-2.15.7/src/routines.ycp
--- old/yast2-samba-client-2.15.6/src/routines.ycp 2007-03-08 11:06:05.000000000 +0100
+++ new/yast2-samba-client-2.15.7/src/routines.ycp 2007-05-31 10:14:13.000000000 +0200
@@ -168,57 +168,8 @@
if (!res) {
return `nojoin;
}
-
return JoinDomain(workgroup);
}
-
-
-/**
- * Show a selection popup to select a workgroup from the ones existing on LAN.
- *
- * @return string chosen workgroup or nil if cancelled
- */
-define string BrowseNeighbours(boolean domains_only) ``{
- list<string> groups = nil;
-
- UI::OpenDialog (
- // popup window
- `Label (_("Looking for available workgroups and domains...")));
-
- UI::BusyCursor ();
-
- if (domains_only) {
- groups = SambaNmbLookup::GetAvailableDomains();
- } else {
- groups = SambaNmbLookup::GetAvailableNeighbours(_(" (Domain)"));
- }
-
- UI::CloseDialog ();
- if( groups == nil ) return nil;
- groups = filter (string group, groups, ``(size (group) > 0));
-
- // let the user choose a workgroup
- UI::OpenDialog( `VBox(
- `HSpacing (36),
- // translators: selection box label
- `SelectionBox(`id(`selection), (domains_only ? _("&Existing Domains") : _("&Existing Neighbours")), groups),
- `HBox(
- `PushButton( `id(`ok), Label::OKButton() ),
- `PushButton( `id(`cancel), Label::CancelButton() )
- )
- ) );
-
- any ret = UI::UserInput();
- string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem );
- // textentry constant (automatically added to some kind of values)
- if ( sel != nil && issubstring (sel, _(" (Domain)") ) )
- {
- integer pos = search (sel, _(" (Domain)") );
- sel = (pos == nil) ? sel : substring (sel, 0, pos);
- }
- UI::CloseDialog();
- return ret == `ok ? sel : nil;
-}
/**
@@ -281,6 +232,15 @@
}
/**
+ * return the help text for DHCP support
+ */
+define string DHCPSupportHelp () {
+
+ // help text ("Retrieve WINS server via DHCP" is a checkbox label)
+ return _("<p>Check <b>Retrieve WINS server via DHCP</b> to use a WINS server provided by DHCP.</p>");
+}
+
+/**
* return the term with shares settings
* @param settings map with parameters to show in term
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/SambaConfig.pm new/yast2-samba-client-2.15.7/src/SambaConfig.pm
--- old/yast2-samba-client-2.15.6/src/SambaConfig.pm 2007-05-17 13:20:01.000000000 +0200
+++ new/yast2-samba-client-2.15.7/src/SambaConfig.pm 2007-05-17 13:51:13.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: Manage samba configuration data (smb.conf).
# Authors: Martin Lazar
#
-# $Id: SambaConfig.pm 36773 2007-03-08 10:06:02Z jsuchome $
+# $Id: SambaConfig.pm 38016 2007-05-17 11:52:37Z jsuchome $
#
# Functions for acess to samba configuration file. It provide
# unified acces to configuration keys including aliases and other
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/src/SambaNmbLookup.pm new/yast2-samba-client-2.15.7/src/SambaNmbLookup.pm
--- old/yast2-samba-client-2.15.6/src/SambaNmbLookup.pm 2006-03-08 10:11:31.000000000 +0100
+++ new/yast2-samba-client-2.15.7/src/SambaNmbLookup.pm 2007-05-31 10:15:57.000000000 +0200
@@ -207,29 +207,4 @@
return FALSE;
}
-# Return a list of workgroups and domains already existing in the lan.
-# @return list<string> of found workgroups/domains
-BEGIN{$TYPEINFO{GetAvailableNeighbours}=["function",["list", "string"], "string"]}
-sub GetAvailableNeighbours {
- my ($self, $domain_suffix) = @_;
- $domain_suffix = "" unless $domain_suffix;
-
- checkNmbstatus();
-
- # TODO: inform user about problems
- return [ map {$_ . ($self->IsDomain($_)?$domain_suffix:"")} sort keys %Nmbstatus_output ];
-}
-
-# Return a list of domains already existing in the lan.
-# @return list<string> of found workgroups/domains
-BEGIN{$TYPEINFO{GetAvailableDomains}=["function",["list", "string"]]}
-sub GetAvailableDomains {
- my ($self) = @_;
-
- checkNmbstatus();
-
- # TODO: inform user about problems
- return [ grep {$self->IsDomain($_)} sort keys %Nmbstatus_output ];
-}
-
8;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.15.6/VERSION new/yast2-samba-client-2.15.7/VERSION
--- old/yast2-samba-client-2.15.6/VERSION 2007-05-17 13:44:44.000000000 +0200
+++ new/yast2-samba-client-2.15.7/VERSION 2007-05-30 09:28:58.000000000 +0200
@@ -1 +1 @@
-2.15.6
+2.15.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org