fix bug #20162 (can't launch samba wizard)V3_0_24mdk

4 files changed, 20 insertions, 4 deletions

diff --git a/drakwizard.spec b/drakwizard.spec
index d5273594..5b09f71b 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -1,6 +1,6 @@
 %define name drakwizard
 %define version 3.0
-%define release 22mdk
+%define release 24mdk
 
 Name: %{name}
 Version: %{version}
@@ -93,6 +93,22 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
 %_datadir/wizards/proxy_wizard
 
 %changelog
+* Wed Feb 15 2006 Antoine Ginies <aginies@mandriva.com> 3.0-24mdk
+- fix bug #20162
+- do not install packages in testing mode (tvignaud)
+- blino: 
+   * bug #20360
+   * use the new wizards API
+   * use wizards::check_rpm
+   * simplify and perl_checker style
+   * rename wizards hash to avoid confusion
+   * bless directly the wizard object instead of wrapping it in a hash
+   * drop old wizard stuff, use the wizards module
+   * fix additionnal wizard detection
+
+* Tue Nov 29 2005 Antoine Ginies <aginies@n3.mandriva.com> 3.0-23mdk
+- misc fix bug #19999
+
 * Fri Sep  9 2005  <guibo@guibpiv.guibland.com> 3.0-22mdk
 - Bind: fix serial pb. (#17886)
 - Fix Samba wizard.
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index 85a84fda..a0421bea 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -73,7 +73,7 @@ my $o = {
 $::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/sambasrv.png";
 # we ask glueconf to give us the structure representing /etc/samba/smb.conf
 if (!-f "/etc/samba/smb.conf") { mkdir_p("/etc/samba/"); cp_af("/usr/share/wizards/samba_wizard/scripts/smb.conf.default", "/etc/samba/smb.conf") }
-my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });
+my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf'});
 #my $samba = new Libconf::Glueconf::Samba::Smb_conf(filename => '/etc/samba/smb.conf', comments_struct => [['^\s*#'], ['^\s*;']]);
 $samba->{libconf}{disable_inline_comments} = 1;
 
diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm
index 01f8622a..0c5ea761 100755
--- a/samba_wizard/Sambaprint.pm
+++ b/samba_wizard/Sambaprint.pm
@@ -47,7 +47,7 @@ my $o = {
 	};
 $::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png";
 # we ask glueconf to give us the structure representing /etc/samba/smb.conf
-my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });
+my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf'});
 
 #debug
 use Data::Dumper;
diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm
index 54345fde..870531c2 100755
--- a/samba_wizard/Sambashare.pm
+++ b/samba_wizard/Sambashare.pm
@@ -56,7 +56,7 @@ my $o = {
 	};
 $::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png";
 # we ask glueconf to give us the structure representing /etc/samba/smb.conf
-my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });
+my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf'});
 
 #use Data::Dumper;
 #print Dumper($samba);