sync with latest SVN snapshot before SVN crash

1 files changed, 62 insertions, 4 deletions

diff --git a/drakconf.spec b/drakconf.spec
index 8f48d3d1..b789d136 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -6,7 +6,7 @@
 
 Summary:  The Mandriva Linux Control Center 
 Name:     drakconf
-Version:  10.4.3
+Version:  10.4.16
 Release:  %mkrel 1
 # get the source from our cvs repository (see
 # http://www.mandrivalinux.com/en/cvs.php3)
@@ -26,10 +26,14 @@ Requires: harddrake-ui > 10-12mdk, popt >= 1.6.4-24mdk, usermode
 Requires: perl-Gtk2 >= 1.023-1mdk, perl-Gnome2-Vte
 Requires: gtk+2.0 >= 2.2.0-3mdk, perl-MDK-Common => 1.0.4-16mdk
 #Requires: drakcronat >= 0.1.3-1mdk # currenly broken, actually waiting for gtk+-2.x port completion
-Requires: menudrake >= 0.7.2-1mdk, userdrake => 1.2-1mdk
+Requires: drakmenustyle, userdrake => 1.2-1mdk
 Requires: drakconf-icons = %version
+Requires: drakxnet, printerdrake
 BuildRoot: %_tmppath/%name-%version-buildroot
 Conflicts: rpmdrake < 2.4-5mdk
+# workaround rpm issues on updates (bad ordering relating to virtual packages?):
+Requires: perl-Gtk2-Html2
+%define _requires_exceptions perl(Gtk2::Html2)
 
 %description
 drakconf includes the Mandriva Linux Control Center which is an interface to 
@@ -48,7 +52,6 @@ tools' banners.
 %setup -q
 
 %build
-perl -pi -e 's/^use strict/#use strict/g' control-center
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -60,7 +63,7 @@ rm -fr $RPM_BUILD_ROOT
 #install menu
 mkdir -p %buildroot/%_menudir
 cat > %buildroot/%_menudir/drakconf << EOF
-?package(%{name}): needs="x11" icon="drakconf.png" section="Configuration" title="Configure Your Computer" longtitle="System configuration tool" command="%_sbindir/%name" \
+?package(%{name}): needs="x11" icon="drakconf.png" section="System/Configuration" title="Configure Your Computer" longtitle="System configuration tool" command="%_sbindir/%name" \
 xdg="true"
 EOF
 
@@ -133,6 +136,61 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 26 2007 Thierry Vignaud <tvignaud@mandriva.com> 10.4.16-1mdv2007.1
+- do not account help browser as a child to wait for, thus enabling to
+  close mcc while help is browsed in external browser (#28442)
+
+* Mon Dec  4 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.15-1mdv2007.1
+- about dialog:
+  o don't display emails of authors
+  o fix banner
+
+* Thu Nov 30 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.14-1mdv2007.1
+- requires drakx-net & printerdrake
+
+* Fri Sep 22 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.13-1mdv2007.0
+- fix menu group
+- workaround rpm issues on updates
+
+* Tue Sep 19 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.12-1mdv2007.0
+- handle embedded tools that block SIG_KILL (#24914)
+
+* Fri Sep 15 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.11-1mdv2007.0
+- news & kolab wizards are now dead
+
+* Tue Sep 12 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.10-1mdv2007.0
+- translation update
+
+* Fri Sep  8 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.9-1mdv2007.0
+- allow to disable 3d desktop in text drakconf (#25316)
+- printer wizard doesn't exist anymore
+
+* Wed Sep  6 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.8-1mdv2007.0
+- unhide main XFdrake icon
+
+* Tue Sep  5 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.7-1mdv2007.0
+- drakmenustyle replaced menudrake
+- show localekdrake in mcc
+
+* Mon Aug 28 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.6-1mdv2007.0
+- update translations
+
+* Mon Aug 28 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.5-1mdv2007.0
+- fix bogus icons (#24789)
+
+* Thu Aug 24 2006 Olivier Blin <oblin@mandriva.com> 10.4.4-1mdv2007.0
+- add drak3d, drakinvictus and drakvpn
+- update draknetprofile icon
+- from Thierry Vignaud:
+  o set minimum size to a bigger value if screen size is bigger than 640x480
+    (thus fixing overlapping widgets when resizing mcc to its minimal size)
+  o prevent "spoofing" minimum size
+  o s/Mandrake/Mandriva/ in icon file names (#21539)
+  o drakxconf: warn if tool is not executable
+  o drakxconf: tinyfirewall was replaced drakfirewall (#24592)
+- from Stew Benedict:
+  o let drakbackup show only it's own menu
+
 * Tue Aug  1 2006 Thierry Vignaud <tvignaud@mandriva.com> 10.4.3-1mdv2007.0
 - fix menu entry