updated

1 files changed, 66 insertions, 5 deletions

diff --git a/DrakConf.spec b/DrakConf.spec
index 47e48231..ed9ecf04 100644
--- a/DrakConf.spec
+++ b/DrakConf.spec
@@ -5,7 +5,7 @@
 Summary:	The Mandrake Control Center 
 Name:		%{name}
 Version:	%{version}
-Release: 6mdk
+Release: 25mdk
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 Source0:	%{name}-%{version}.tar.bz2
@@ -14,7 +14,7 @@ Source2:	drakconf32.xpm.bz2
 Source3:	drakconf48.xpm.bz2
 Copyright:	GPL
 Group:		System/Configuration/Other
-Requires:	drakxtools >= 1.1.5-39mdk, gtk+mdk, perl, usermode, drakfloppy >= 0.42-1mdk, harddrake >= 0.9.3-14mdk, DrakeLogo >= 1.0-18mdk, drakfont >= 0.58-1mdk, XFree86-100dpi-fonts
+Requires:	drakxtools >= 1.1.5-60mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode, drakfloppy >= 0.42-5mdk, harddrake >= 0.9.3-15mdk, drakfont >= 0.58-7mdk, XFree86-100dpi-fonts
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 
 %description
@@ -46,7 +46,7 @@ mv ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin/DrakConf \
    ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin/DrakConf.real
 ln -sf %{_bindir}/consolehelper ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin/DrakConf
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,security/console.apps}
-cp pam.drakconf $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/DrakConf
+cp pam.drakconf $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/drakconf
 cp apps.DrakConf  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/DrakConf
 
 
@@ -56,7 +56,7 @@ cp apps.DrakConf  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/DrakConf
 #install menu
 mkdir -p $RPM_BUILD_ROOT%{_menudir}
 cat > $RPM_BUILD_ROOT%{_menudir}/DrakConf << EOF
-?package(DrakConf): needs="X11" icon="drakconf.xpm" section="Configuration/Other" title="DrakConf" longtitle="System configuration tool" command="/usr/X11R6/bin/DrakConf"
+?package(DrakConf): needs="text" icon="drakconf.xpm" section="Configuration/Other" title="DrakConf" longtitle="System configuration tool" command="/usr/X11R6/bin/DrakConf"
 EOF
 
 #install menu icon
@@ -83,11 +83,72 @@ rm -rf $RPM_BUILD_ROOT
 %{_menudir}/DrakConf
 %{_miconsdir}/*.xpm
 %{_iconsdir}/*.xpm
+%{_iconsdir}/*.png
 %{_liconsdir}/*.xpm
-%config(noreplace) %{_sysconfdir}/pam.d/DrakConf
+%{_sbindir}/clock.pm
+%config(noreplace) %{_sysconfdir}/pam.d/drakconf
 %config(noreplace) %{_sysconfdir}/security/console.apps/DrakConf
 
 %changelog
+* Sat Mar 24 2001 dam's <damien@mandrakesoft.com> 0.61-25mdk
+- readded service.png
+
+* Sat Mar 24 2001 dam's <damien@mandrakesoft.com> 0.61-24mdk
+- use cvs DrakConf.spec
+
+* Fri Mar 23 2001 dam's <damien@mandrakesoft.com> 0.61-23mdk
+- corrected bad require
+
+* Fri Mar 23 2001 dam's <damien@mandrakesoft.com> 0.61-22mdk
+- included tinyfirewall
+
+* Wed Mar 21 2001 dam's <damien@mandrakesoft.com> 0.61-21mdk
+- corrected bad execution path.
+
+* Tue Mar 20 2001 dam's <damien@mandrakesoft.com> 0.61-20mdk
+- requires updated for new drakxtools and drakfont.
+
+* Tue Mar 20 2001 dam's <damien@mandrakesoft.com> 0.61-19mdk
+- updated requires.
+- DrakConf crash bug corrected by daouda.
+
+* Wed Mar 14 2001 dam's <damien@mandrakesoft.com> 0.61-18mdk
+- corrected bad use in perl script
+
+* Wed Mar 14 2001 dam's <damien@mandrakesoft.com> 0.61-17mdk
+- new icons
+
+* Wed Mar 14 2001 Daouda Lo <daouda@mandrakesoft.com> 0.61-16mdk
+- workaround  for this *$ù^ DrakConf crash bug.
+
+* Mon Mar 12 2001 dam's <damien@mandrakesoft.com> 0.61-15mdk
+- updated requires
+
+* Mon Mar 12 2001 dam's <damien@mandrakesoft.com> 0.61-14mdk
+- corrected requires
+
+* Mon Mar 12 2001 dam's <damien@mandrakesoft.com> 0.61-13mdk
+- new drakxservices included.
+
+* Fri Mar  9 2001 dam's <damien@mandrakesoft.com> 0.61-12mdk
+- No more DrakeLogo
+- new icons, wait message.
+
+* Wed Mar  7 2001  Daouda Lo <daouda@mandrakesoft.com> 0.61-11mdk
+- fix pam authentification typo
+
+* Wed Mar  7 2001 dam's <damien@mandrakesoft.com> 0.61-10mdk
+- corrected requires
+
+* Tue Mar  6 2001 dam's <damien@mandrakesoft.com> 0.61-9mdk
+- bug fix, improvement.
+
+* Tue Feb 27 2001 dam's <damien@mandrakesoft.com> 0.61-8mdk
+- TERM signal handling.
+
+* Tue Feb 27 2001 dam's <damien@mandrakesoft.com> 0.61-7mdk
+- some bug fix, new pixmaps.
+
 * Mon Feb 12 2001  Daouda Lo <daouda@mandrakesoft.com> 0.61-6mdk
 - corrected typo