Hello community,
here is the log from the commit of package yast2-samba-client
checked in at Fri Dec 1 12:01:46 CET 2006.
--------
--- yast2-samba-client/yast2-samba-client.changes 2006-11-06 11:16:32.000000000 +0100
+++ /mounts/work_src_done/NOARCH/NOARCH/yast2-samba-client/yast2-samba-client.changes 2006-12-01 11:52:36.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 30 13:41:31 CET 2006 - jsuchome@suse.cz
+
+- install architecture-specific packages (#224418)
+- prevent 'net' asking for root's pw (#225224)
+- 2.14.4
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-2.14.3.tar.bz2
New:
----
yast2-samba-client-2.14.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.WBOuzt/_old 2006-12-01 12:01:39.000000000 +0100
+++ /var/tmp/diff_new_pack.WBOuzt/_new 2006-12-01 12:01:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.14.3)
+# spec file for package yast2-samba-client (Version 2.14.4)
#
# Copyright (c) 2006 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.14.3
+Version: 2.14.4
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.14.3.tar.bz2
+Source0: yast2-samba-client-2.14.4.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.14.3
+%setup -n yast2-samba-client-2.14.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-samba-client
%changelog -n yast2-samba-client
+* Thu Nov 30 2006 - jsuchome@suse.cz
+- install architecture-specific packages (#224418)
+- prevent 'net' asking for root's pw (#225224)
+- 2.14.4
* Mon Nov 06 2006 - jsuchome@suse.cz
- use correct AD domain name for joining (#214463, #214641)
- give NTP client module information about server (#215645)
++++++ yast2-samba-client-2.14.3.tar.bz2 -> yast2-samba-client-2.14.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/VERSION new/yast2-samba-client-2.14.4/VERSION
--- old/yast2-samba-client-2.14.3/VERSION 2006-11-06 09:14:16.000000000 +0100
+++ new/yast2-samba-client-2.14.4/VERSION 2006-12-01 11:13:11.000000000 +0100
@@ -1 +1 @@
-2.14.3
+2.14.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/src/Samba.ycp new/yast2-samba-client-2.14.4/src/Samba.ycp
--- old/yast2-samba-client-2.14.3/src/Samba.ycp 2006-10-30 13:42:02.000000000 +0100
+++ new/yast2-samba-client-2.14.4/src/Samba.ycp 2006-11-30 13:45:02.000000000 +0100
@@ -15,6 +15,7 @@
module "Samba";
textdomain "samba-client";
+import "Arch";
import "Autologin";
import "FileUtils";
import "Mode";
@@ -88,6 +89,44 @@
global string shares_separator = "\\";
+// packages to install for specific arhitectures (#224418)
+global map arch_packages = $[
+ "krb5" : $[
+ "ia64" : [ "krb5-x86" ],
+ "ppc64" : [ "krb5-64bit" ],
+ "s390_64" : [ "krb5-32bit" ],
+ "x86_64" : [ "krb5-32bit" ],
+ ],
+ "samba-client" : $[
+ "ia64" : [ "samba-client-x86" ],
+ "ppc64" : [ "samba-client-64bit" ],
+ "s390_64" : [ "samba-client-32bit" ],
+ "x86_64" : [ "samba-client-32bit" ],
+ ],
+ "samba-winbind" : $[
+ "ia64" : [ "samba-winbind-x86" ],
+ "ppc64" : [ "samba-winbind-64bit" ],
+ "s390_64" : [ "samba-winbind-32bit" ],
+ "x86_64" : [ "samba-winbind-32bit" ],
+ ],
+];
+
+/**
+ * Return list of architecture specific packages (derived from package list
+ * given as parameter) merged with the packages in parameter
+ */
+global define list<string> UpdatedArchPackages (list<string> packages) {
+
+ list<string> ret = packages;
+ string arch = Arch::architecture ();
+
+ foreach (string package, packages, {
+ ret = (list<string>) union (ret, arch_packages[package,arch]:[]);
+ });
+ return ret;
+}
+
+
/**
* Data was modified?
* @return true if modified
@@ -346,7 +385,9 @@
SambaConfig::Read(false);
// check installed packages
- if (!PackageSystem::CheckAndInstallPackagesInteractive(["samba-client"])) {
+ if (!PackageSystem::CheckAndInstallPackagesInteractive(
+ UpdatedArchPackages (["samba-client"])))
+ {
y2warning("package samba-client not installed");
return false;
}
@@ -492,8 +533,8 @@
ret = false;
}
if (!SambaWinbind::AdjustPam(winbind_enabled)) {
- // translators: error message, %1 is filename
- Report::Error(sformat(_("Cannot write settings to %1."), "/etc/security/pam_unix2.conf"));
+ // translators: error message
+ Report::Error (_("Cannot write PAM settings."));
ret = false;
}
@@ -731,10 +772,13 @@
* @return map of packages to be installed and to be removed
*/
global define map AutoPackages() ``{
- list to_install = ["samba-client", "samba-winbind"];
+ list<string> to_install = ["samba-client", "samba-winbind"];
if (SambaAD::ADS () != "")
- to_install = union (to_install, ["krb5", "krb5-client"]);
- return $["install": to_install, "remove": []];
+ to_install = (list<string>) union (to_install, ["krb5", "krb5-client"]);
+ return $[
+ "install" : UpdatedArchPackages (to_install),
+ "remove" : []
+ ];
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/src/SambaAD.pm new/yast2-samba-client-2.14.4/src/SambaAD.pm
--- old/yast2-samba-client-2.14.3/src/SambaAD.pm 2006-10-30 16:06:41.000000000 +0100
+++ new/yast2-samba-client-2.14.4/src/SambaAD.pm 2006-12-01 11:46:59.000000000 +0100
@@ -121,7 +121,7 @@
}
}
if ($server ne "" &&
- SCR->Execute (".target.bash", "net ads lookup -S $server") ne 0) {
+ SCR->Execute (".target.bash", "net ads lookup -U% -S $server") ne 0) {
$server = "";
}
return $server;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.14.3/src/dialogs.ycp new/yast2-samba-client-2.14.4/src/dialogs.ycp
--- old/yast2-samba-client-2.14.3/src/dialogs.ycp 2006-11-06 10:47:32.000000000 +0100
+++ new/yast2-samba-client-2.14.4/src/dialogs.ycp 2006-11-30 13:46:06.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 33866 2006-10-30 15:33:51Z jsuchome $
+ * $Id: dialogs.ycp 34057 2006-11-06 10:17:24Z jsuchome $
*/
{
@@ -300,6 +300,7 @@
{
packages = (list<string>)merge(packages,["krb5","krb5-client"]);
}
+ packages = Samba::UpdatedArchPackages (packages);
if (!Package::InstalledAll (packages))
Package::InstallAll (packages);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org