remove all entry in menu, now use two RPM drakwizard and drakwizard-base

1 files changed, 48 insertions, 69 deletions

diff --git a/drakwizard.spec b/drakwizard.spec
index f38342af..54bfd369 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -1,6 +1,6 @@
 %define name drakwizard
 %define version 3.0
-%define release 13mdk
+%define release 14mdk
 
 Name: %{name}
 Version: %{version}
@@ -9,17 +9,14 @@ Source0: %{name}-%{version}.tar.bz2
 Source1: %name.png
 License: GPL
 Group: System/Configuration/Other
-Requires: perl-base, usermode, perl-Locale-gettext, drakxtools >= 9.1-0.4mdk, perl-Libconf >= 0.39.19
+Requires: perl-base, usermode, perl-Locale-gettext, drakxtools >= 9.1-0.4mdk, perl-Libconf >= 0.39.19, drakwizard-base
 BuildRequires: gettext-base, ImageMagick, perl-base
 Buildroot: %{_tmppath}/%{name}
 BuildArch: noarch
 Prefix: %{_prefix}
 Packager: Antoine Ginies <aginies@mandriva.com>
-
 Obsoletes: wizards_lib-dhcp wizards_lib-ftp wizards_lib-web wizards_lib wizard wizards_lib-time wizards_lib-global wizards_lib-dns wizards_lib-server wizards_lib-proxy wizards_lib-db wizards_lib-news wizards_lib-firewall wizards_lib-client wizards_lib-common wizards_lib-postfix
-
 Provides: wizards_lib-dhcp wizards_lib-ftp wizards_lib-web wizards_lib wizard wizards_lib-time wizards_lib-global wizards_lib-dns wizards_lib-server wizards_lib-proxy wizards_lib-db wizards_lib-news wizards_lib-firewall wizards_lib-client wizards_lib-common wizards_lib-postfix
-
 Summary: Wizard Launcher and its collection of wizards
 URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/wizard_perl
 
@@ -27,9 +24,17 @@ URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/wizard_perl
 drakwizard allows you to launch :
 - server wizard: configures basic services.
 - global wizard: wizard that launch each other.
-- dhcpd, dns, postfix, samba, web, ftp, nis, ldap, apache, news,
+- dhcpd, dns, ftp, nis, ldap, apache, news,
   time wizards, ssh.
 
+%package base
+Summary: Base of Wizard Launcher
+Group: System/Configuration/Other
+
+%description base
+wizard
+- postfix, samba, web
+
 %prep
 %setup -q -n %{name}
 
@@ -40,79 +45,53 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-samba
-?package(%{name}): command="%{_sbindir}/%{name} samba" icon="%{name}.png" needs="x11" title="Samba Wizard" longtitle="Samba Wizard" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-sambashare
-?package(%{name}): command="%{_sbindir}/%{name} sambashare" icon="%{name}.png" needs="x11" title="Samba share management" longtitle="Samba share management" section="Configuration/Wizard/"
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-sambaprint
-?package(%{name}): command="%{_sbindir}/%{name} sambaprint" icon="%{name}.png" needs="x11" title="Samba printer management" longtitle="Samba print management" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-ftp
-?package(%{name}): command="%{_sbindir}/%{name} proftpd" icon="%{name}.png" needs="x11" title="Proftpd wizard" longtitle="Proftpd wizard" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-dhcp
-?package(%{name}): command="%{_sbindir}/%{name} dhcp" icon="%{name}.png" needs="x11" title="Dhcp wizard" longtitle="Dhcp wizard" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-bind
-?package(%{name}): command="%{_sbindir}/%{name} bind" icon="%{name}.png" needs="x11" title="Bind wizard" longtitle="Bind wizard" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-nis
-?package(%{name}): command="%{_sbindir}/%{name} nisautofs" icon="%{name}.png" needs="x11" title="NIS autofs wizard" longtitle="NIS autofs wizard" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-nfs
-?package(%{name}): command="%{_sbindir}/%{name} nfs" icon="%{name}.png" needs="x11" title="NFS wizard" longtitle="NFS wizard" section="Configuration/Wizard/"
-EOF
-cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}-ssh
-?package(%{name}): command="%{_sbindir}/%{name} sshd" icon="%{name}.png" needs="x11" title="SSH wizard" longtitle="SSH wizard" section="Configuration/Wizard/"
-EOF
-
-
-(mkdir -p %{buildroot}/%{_menudir}
-cat > %{buildroot}/%{_menudir}/%{name}  <<EOF
-?package(%name): \
-command="%{_sbindir}/%{name}" needs="X11" icon="%name.png" section="Configuration/Wizard/" title="Drakwizard" longtitle="Drakwizard" 
-EOF
-)
-
-
-mkdir -p $RPM_BUILD_ROOT/%_liconsdir
-mkdir -p $RPM_BUILD_ROOT/%_iconsdir
-mkdir -p $RPM_BUILD_ROOT/%_miconsdir
-convert -size 48x48 %{SOURCE1} $RPM_BUILD_ROOT/%_liconsdir/%name.png
-mkdir -p $RPM_BUILD_ROOT/%_iconsdir
-convert -size 32x32 %{SOURCE1} $RPM_BUILD_ROOT/%_iconsdir/%name.png
-mkdir -p $RPM_BUILD_ROOT/%_miconsdir
-convert -size 16x16 %{SOURCE1} $RPM_BUILD_ROOT/%_miconsdir/%name.png
-
-%post
-%{update_menus}
-
-%postun
-%{clean_menus}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
 
-%files -f %{name}.lang
+%files base -f %{name}.lang
 %defattr(-,root,root)
 %doc TODO README.adding_wizard
 %config(noreplace) %_sysconfdir/gnome-vfs-2.0/vfolders/*
 %_sbindir/drakwizard
-%{_datadir}/pixmaps/%name.png
-%{_menudir}/%{name}*
-%{_liconsdir}/%name.png
-%{_iconsdir}/%name.png
-%{_miconsdir}/%name.png
-%_datadir/wizards*
-%{perl_vendorlib}/MDK/
+%{perl_vendorlib}/MDK/Wizard/Apache.pm
+%{perl_vendorlib}/MDK/Wizard/Postfix.pm
+%{perl_vendorlib}/MDK/Wizard/Varspaceval.pm
+%{perl_vendorlib}/MDK/Wizard/Wizcommon.pm
+%{perl_vendorlib}/MDK/Wizard/IFCFG.pm
+%{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/desktop/*
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%{perl_vendorlib}/MDK/Wizard/Bind.pm
+%{perl_vendorlib}/MDK/Wizard/Dhcp.pm
+%{perl_vendorlib}/MDK/Wizard/Inn.pm
+%{perl_vendorlib}/MDK/Wizard/Installsrv.pm
+%{perl_vendorlib}/MDK/Wizard/ldapdef.pm
+%{perl_vendorlib}/MDK/Wizard/Ldap.pm
+%{perl_vendorlib}/MDK/Wizard/NFS.pm
+%{perl_vendorlib}/MDK/Wizard/Nisautofs.pm
+%{perl_vendorlib}/MDK/Wizard/Ntp.pm
+%{perl_vendorlib}/MDK/Wizard/Proftpd.pm
+%{perl_vendorlib}/MDK/Wizard/Squid.pm
+%{perl_vendorlib}/MDK/Wizard/Sshd.pm
+%_datadir/wizards/dhcp_wizard
+%_datadir/wizards/dns_wizard
+%_datadir/wizards/ftp_wizard
+%_datadir/wizards/news_wizard
+%_datadir/wizards/proxy_wizard
 
 %changelog
+* Tue Aug  9 2005 Antoine Ginies <aginies@n1.mandriva.com> 3.0-14mdk
+- split into drakwizard, and drakwizard-base
+- update all PO files (thx all translators)
+- remove entry in menu
+
 * Mon Aug  8 2005  Antoine Ginies <aginies@n1.mandriva.com> 3.0-13mdk
 - FTP: fix bug #16899
 - Squid: fix bug #17112