- manual installation of 32bit packages packages no longer needed

  (bnc#354164)
- 2.18.0


svn path=/trunk/fingerprint-reader/; revision=57774

VERSION

@@ -1 +1 @@
-2.17.6
+2.18.0

package/yast2-fingerprint-reader.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 26 15:07:20 CEST 2009 - jsuchome@suse.cz
+
+- manual installation of 32bit packages packages no longer needed
+  (bnc#354164)
+- 2.18.0
+
 -------------------------------------------------------------------
 Fri Jun 19 12:37:32 CEST 2009 - mvidner@suse.cz
 

src/FingerprintReader.ycp

@@ -35,7 +35,6 @@
 module "FingerprintReader";
 textdomain "fingerprint-reader";
 
-import "Arch";
 import "FileUtils";
 import "Pam";
 import "Popup";
@@ -56,16 +55,6 @@ global boolean run_users	= false;
  */
 global list<string> required_packages = ["pam_fp"];
 
-// packages to install for specific architectures (see e.g. #224510)
-global map arch_packages	= $[
-    "pam_fp"	: $[
-        "ia64"		: [ "pam_fp-x86" ],
-        "ppc64"		: [ "pam_fp-64bit" ],
-        "s390_64"	: [ "pam_fp-32bit" ],
-        "x86_64"	: [ "pam_fp-32bit" ],
-    ],
-];
-
 /**
  * Write only, used during autoinstallation.
  * Don't run services and SuSEconfig, it's all done at one place.
@@ -250,21 +239,6 @@ global define string ShortSummary() {
 	_("No"));
 }
 
-/**
- * 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;
-}
-
 /**
  * Return packages needed to be installed and removed during
  * Autoinstallation to insure module has all needed software

src/dialogs.ycp

@@ -139,10 +139,7 @@ The fingerprint reader configuration updates your PAM settings to enable authent
 	    // temporary enable pam module
 	}
         else if (ret == `next) {
-	    if (use_pam &&
-		!Package::InstallAll (FingerprintReader::UpdatedArchPackages (
-		    FingerprintReader::required_packages))
-	    )
+	    if (use_pam && !Package::InstallAll (FingerprintReader::required_packages))
 	    {
 		use_pam     = false;
 		UI::ChangeWidget (`id (`rd), `Value, `pamno);