diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | drakwizard.spec | 15 | ||||
| -rw-r--r-- | nfs_wizard/Makefile | 2 | ||||
| -rw-r--r-- | samba_wizard/Makefile | 2 | ||||
| -rwxr-xr-x | samba_wizard/Samba.pm | 2 | ||||
| -rwxr-xr-x | samba_wizard/Sambaprint.pm | 2 | ||||
| -rwxr-xr-x | samba_wizard/Sambashare.pm | 2 | ||||
| -rw-r--r-- | sshd_wizard/Makefile | 4 | ||||
| -rwxr-xr-x | sshd_wizard/Sshd.pm | 7 |
9 files changed, 29 insertions, 13 deletions
@@ -49,6 +49,12 @@ install: install --mode=a=r -p $$l/scripts/*.default ${prefix}/share/wizards/$$l/scripts; \ fi \ done + for l in $(WIZ); do \ + if ls $$l/images/*.png &> /dev/null ; then \ + install --mode=u=rwx,g=rx,o=rx -d ${prefix}/share/wizards/$$l/images/; \ + install --mode=a=r -p $$l/images/*.png ${prefix}/share/wizards/$$l/images/;\ + fi \ + done install --mode=a=r -p news_wizard/scripts/news.cron ${prefix}/share/wizards/news_wizard/scripts/; \ find ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard -type f -regex ".*.pm$$" \ -exec perl -i -pe "s,(\\\$$ENV{__WIZ_HOME__}|__WIZ_HOME__),$(WIZ_HOME),g" \{\} \; diff --git a/drakwizard.spec b/drakwizard.spec index efe9326b..b26f81d4 100644 --- a/drakwizard.spec +++ b/drakwizard.spec @@ -1,6 +1,6 @@ %define name drakwizard %define version 3.0 -%define release 16mdk +%define release 17mdk Name: %{name} Version: %{version} @@ -64,8 +64,8 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME %{perl_vendorlib}/MDK/Wizard/Samba.pm %{perl_vendorlib}/MDK/Wizard/Sambaprint.pm %{perl_vendorlib}/MDK/Wizard/Sambashare.pm -%_datadir/wizards/postfix_wizard -%_datadir/wizards/samba_wizard +%_datadir/wizards/postfix_wizard/* +%_datadir/wizards/samba_wizard/* %_datadir/wizards/desktop/* %files -f %{name}.lang @@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME %{perl_vendorlib}/MDK/Wizard/Proftpd.pm %{perl_vendorlib}/MDK/Wizard/Squid.pm %{perl_vendorlib}/MDK/Wizard/Sshd.pm +%_datadir/wizards/nfs_wizard +%_datadir/wizards/sshd_wizard +%_datadir/wizards/ldap_wizard %_datadir/wizards/dhcp_wizard %_datadir/wizards/dns_wizard %_datadir/wizards/ftp_wizard @@ -89,6 +92,12 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME %_datadir/wizards/proxy_wizard %changelog +* Mon Aug 29 2005 Antoine Ginies <aginies@n1.mandriva.com> 3.0-17mdk +- Postfix: fix masquerade domains misconfiguration +- Sambashare: various fix (public, write list) +- update all PO files (thx all translators) +- use new icons (thx ln) + * Mon Aug 22 2005 Antoine Ginies <aginies@n1.mandriva.com> 3.0-16mdk - various improvement in sambashare wizard diff --git a/nfs_wizard/Makefile b/nfs_wizard/Makefile index 96c1b168..7b0d0866 100644 --- a/nfs_wizard/Makefile +++ b/nfs_wizard/Makefile @@ -8,6 +8,6 @@ install: mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/nfs_wizard/scripts mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/nfs_wizard/images install --mode=u=rwx,g=rx,o=rx -p nfs.wiz ${prefix}/share/wizards/nfs_wizard - install --mode=a=r -p images/NFS.png ${prefix}/share/wizards/nfs_wizard/images + install --mode=a=r -p images/IC-NFS-48.png ${prefix}/share/wizards/nfs_wizard/images install --mode=u=rwx,g=rx,o=rx -p scripts/*.sh ${prefix}/share/wizards/nfs_wizard/scripts install --mode=u=rw,g=r,o=r -p scripts/NFSConf.pm ${prefix}/share/wizards/nfs_wizard/scripts diff --git a/samba_wizard/Makefile b/samba_wizard/Makefile index 332636c7..661dadfa 100644 --- a/samba_wizard/Makefile +++ b/samba_wizard/Makefile @@ -7,6 +7,6 @@ install: mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/samba_wizard/scripts mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/samba_wizard/images install --mode=u=rw,g=r,o=r -p samba.wiz ${prefix}/share/wizards/samba_wizard - install --mode=a=r -p ./images/samba.png ${prefix}/share/wizards/samba_wizard/images + cp -avf ./images/*.png ${prefix}/share/wizards/samba_wizard/images/ install --mode=u=rw,g=r,o=r -p scripts/Smbconf.pm ${prefix}/share/wizards/samba_wizard/scripts install --mode=u=rw,g=r,o=r -p scripts/smb.conf.default ${prefix}/share/wizards/samba_wizard/scripts diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm index 8c9f1d31..02ed73e1 100755 --- a/samba_wizard/Samba.pm +++ b/samba_wizard/Samba.pm @@ -68,7 +68,7 @@ my $o = { test_host_domain($SHORTHOSTNAME, $DOMAINNAME); }, needed_rpm => [ 'samba-server' ], - defaultimage => "/usr/share/wizards/samba_wizard/images/samba.png" + defaultimage => "/usr/share/wizards/samba_wizard/images/sambasrv.png" }; # we ask glueconf to give us the structure representing /etc/samba/smb.conf diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm index e86e18bd..eb697703 100755 --- a/samba_wizard/Sambaprint.pm +++ b/samba_wizard/Sambaprint.pm @@ -43,7 +43,7 @@ my $o = { wiz_printers_browseable => '', wiz_printers_guestok => '', wiz_printers_createmode => '', list_printers => '', }, - defaultimage => "/usr/share/wizards/samba_wizard/images/samba.png" + defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png" }; # we ask glueconf to give us the structure representing /etc/samba/smb.conf diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm index d6ed14ab..b68c7236 100755 --- a/samba_wizard/Sambashare.pm +++ b/samba_wizard/Sambashare.pm @@ -52,7 +52,7 @@ my $o = { wiz_understanding => '', }, needed_rpm => [ 'samba-server' ], - defaultimage => "/usr/share/wizards/samba_wizard/images/samba.png" + defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png" }; # we ask glueconf to give us the structure representing /etc/samba/smb.conf diff --git a/sshd_wizard/Makefile b/sshd_wizard/Makefile index 925452c2..7f9a8e7d 100644 --- a/sshd_wizard/Makefile +++ b/sshd_wizard/Makefile @@ -4,5 +4,5 @@ install2: install: mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/sshd_wizard -# mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/sshd_wizard/images -# install --mode=a=r -p ./images/sshd.png ${prefix}/share/wizards/sshd_wizard/images + mkdir -p --mode=u=rwx,g=rx,o=rx ${prefix}/share/wizards/sshd_wizard/images + install --mode=a=r -p ./images/IC-Dssh-48.png ${prefix}/share/wizards/sshd_wizard/images diff --git a/sshd_wizard/Sshd.pm b/sshd_wizard/Sshd.pm index 10e936ec..ee70fc83 100755 --- a/sshd_wizard/Sshd.pm +++ b/sshd_wizard/Sshd.pm @@ -46,9 +46,9 @@ my $o = { var => { wiz_port => '', }, -# init => sub { -# test_host_domain($SHORTHOSTNAME, $DOMAINNAME); -# }, + init => sub { + test_host_domain($SHORTHOSTNAME, $DOMAINNAME); + }, needed_rpm => [ 'openssh-server' ], defaultimage => "/usr/share/wizards/sshd_wizard/images/sshd.png" }; @@ -70,6 +70,7 @@ $o->{pages} = { { label => "", type => 'list', val => \$o->{var}{wiz_type}, list => [ keys %type ], format => sub { $type{$_[0]} } }, ], next => 'config_step1', + no_back => 1, }, config_step1 => { name => N('SSH server, classical options'), |