- make: add a srpm target

- control-center:
  o document all data structures
  o add tiny firewall, drakbackup and drakcronat
    (why'ren't they not embedded ?)
  o kill useless cursor
  o requires drakcronat

3 files changed, 22 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 2b182cb6..207b06c5 100644
--- a/Makefile
+++ b/Makefile
@@ -38,13 +38,16 @@ dis: clean
 	tar cjf ../$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
 	rm -rf $(NAME)-$(VERSION)
 
-rpm: dis 
+srpm: dis 
 #       ../$(NAME)-$(VERSION).tar.bz2 $(RPM)
 	chmod 0644 ../$(NAME)-$(VERSION).tar.bz2 *.png.bz2 #rpmlint is happy
 	cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
 	cp -f *.png.bz2 $(RPM)/SOURCES
 	cp -f $(NAME).spec $(RPM)/SPECS/
-	rpm -ba --clean --rmsource $(NAME).spec
+	rpm -bs $(NAME).spec
+
+rpm: srpm
+	rpm -bb --clean --rmsource $(NAME).spec
 	rm -f ../$(NAME)-$(VERSION).tar.bz2
 	cvs commit
 
diff --git a/control-center b/control-center
index 473c534c..6930559f 100755
--- a/control-center
+++ b/control-center
@@ -79,6 +79,7 @@ my ($log_check_box, $embedded_check_box);
 $::isWiz = -e "/usr/sbin/drakwizard";
 $::isRpmDrake = -e "/usr/sbin/rpmdrake";
 
+# { key => [log_exp, binary, gtkplug?, alternate] }
 my $exec_hash = 
   {
    _("Boot Disk") => [ "drakfloppy", "$_sbindir/drakfloppy", 1],
@@ -102,6 +103,9 @@ my $exec_hash =
    _("Connection Sharing") => [ "drakgw", "$_sbindir/drakgw", 1 ],
    _("Proxy Configuration") => [ "drakproxy", "$_sbindir/drakproxy", 1 ],
    _("Security Level") => [ "draksec", "$_sbindir/draksec", 1 ],
+   _("Programs scheduling") => [ "drakcronat", "/usr/X11R6/bin/drakcronat", -1 ],
+   _("Firewall") => [ "tinyfirewall", "$_sbindir/tinyfirewall", -1 ],
+   _("Backups") => [ "drakbackup", "$_sbindir/drakbackup", -1 ],
    _("Menus") => [ "menudrake", "$_sbindir/menus_launcher.pl", 1, "$_bindir/menudrake" ],
    _("Services") => [ "drakxservices", "$_sbindir/drakxservices", 1 ],
    _("Fonts") => [ "drakfont", "$_sbindir/drakfont", 1 ],
@@ -131,6 +135,7 @@ my $exec_hash =
    _("Web") => ["Web wizard", "drakwizard $_wizdir/web_wizard/web.wiz", -1 ],
   };
 
+# { name => [ label, icon core ] }
 my %wizard = ("client" => [ _("DNS Client"), 'server-mdk'],
  	       "dhcp" => [ _("DHCP"), 'server-mdk'],
  	       "dns" => [ _("DNS"), 'server-mdk'],
@@ -144,6 +149,10 @@ my %wizard = ("client" => [ _("DNS Client"), 'server-mdk'],
  	       "web" => [ _("Web"), 'server-mdk'],
  	     );
 
+# { class_name => [
+#                  [ label, icon core ]
+#                 ]
+# }
 my @tree =
   ([_("Boot"), 'boot-mdk',  
      [
@@ -205,7 +214,7 @@ my @tree =
     [_("Security"),'security-mdk',
      [
       [_("Security Level"), 'draksec-mdk'],
-#      [_("Firewall"), 'firewall-mdk'],
+      [_("Firewall"), 'firewall-mdk'],
      ]
     ],
     [_("System"),'system-mdk',
@@ -217,6 +226,8 @@ my @tree =
       [_("Logs"), 'logdrake-mdk'],
       [_("Console"), 'console-mdk'],
       [_("Users"), 'user-mdk'],
+      [_("Programs scheduling"), 'drakboot-mdk'],
+      [_("Backups"), 'drakboot-mdk'],
 #      [_("RFBDrake"), 'unknown-mdk'],
      ]
     ],
@@ -252,7 +263,6 @@ my ($pixmap_back_left, undef) = gtkcreate_png_('mcc-left-back');
 my @darea_left_list;
 my $cursor_hand = new Gtk::Gdk::Cursor 60;
 my $cursor_normal = new Gtk::Gdk::Cursor 68;
-my $cursor_busy = new Gtk::Gdk::Cursor 150;
 my @back;
 ($back[0], undef) = gtkcreate_png_('mcc-left-back');
 $back[1] = $back[0];
diff --git a/drakconf.spec b/drakconf.spec
index b1d80228..304de600 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -6,7 +6,7 @@
 Summary:	The Mandrake Control Center 
 Name:		drakconf
 Version:	%version
-Release:	0.7mdk
+Release:	0.8mdk
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 Source0:	%name-%version.tar.bz2
@@ -23,7 +23,7 @@ Requires:	menudrake >= 0.6.5-2mdk, harddrake-ui >= 1.1.8-16mdk
 Requires:	perl-GTK, perl-GTK-GdkImlib, usermode
 Requires:	popt >= 1.6.3-9mdk
 Requires:	XFree86-100dpi-fonts
-Requires:	rxvt
+Requires:	rxvt, drakconnect
 BuildRoot:	%_tmppath/%name-%version-buildroot
 
 %description
@@ -103,8 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %_datadir/mcc/kde
 
 %changelog
-* Wed Aug 21 2002 dchaumette <dchaumette@mandrakesoft.com> 9.0-0.8mdk
-- fix wrong link in menu
+* Fri Aug 23 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.8mdk
+- add drakcronat, drakbackup, tinyfirewall
+- fix wrong link in menu (poulpy)
 - add support for system-settings for GNOME2 (fcrozat)
 
 * Wed Aug 14 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.7mdk