diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-01-06 15:30:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-01-06 15:30:41 +0000 |
| commit | 7b806235678dbc76e3976bb8fd9cb0a1521fa250 (patch) | |
| tree | e64e6eb34f3d37ed966c205597ef6d8202a7a0e2 /perl-install/drakxtools.spec | |
| parent | 67b53f4298b8536bc5cea5c1aff0c538e0925c3d (diff) | |
| download | drakx-7b806235678dbc76e3976bb8fd9cb0a1521fa250.tar drakx-7b806235678dbc76e3976bb8fd9cb0a1521fa250.tar.gz drakx-7b806235678dbc76e3976bb8fd9cb0a1521fa250.tar.bz2 drakx-7b806235678dbc76e3976bb8fd9cb0a1521fa250.tar.xz drakx-7b806235678dbc76e3976bb8fd9cb0a1521fa250.zip | |
- drakfloppy must not be in drakxtools-newt, must now require mkbootdisk
(which is not installed by default anymore)
Diffstat (limited to 'perl-install/drakxtools.spec')
| -rw-r--r-- | perl-install/drakxtools.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec index 6a7408bff..d00e53424 100644 --- a/perl-install/drakxtools.spec +++ b/perl-install/drakxtools.spec @@ -7,7 +7,7 @@ Source0: %name-%version.tar.bz2 License: GPL Group: System/Configuration/Other Requires: %{name}-newt = %version-%release, perl-Gtk2 >= 0.95-6mdk, /usr/X11R6/bin/xtest, font-tools, usermode >= 1.63-5mdk, perl-MDK-Common >= 1.1.2-2mdk, gurpmi -Requires: foomatic-db-engine +Requires: foomatic-db-engine, mkbootdisk Conflicts: drakconf < 9.3-10mdk Conflicts: rpmdrake < 2.1-29mdk Conflicts: mandrake_doc-drakxtools-en < 9.2, mandrake_doc-drakxtools-es < 9.2, mandrake_doc-drakxtools-fr < 9.2 @@ -173,7 +173,7 @@ dirs1="usr/lib/libDrakX usr/share/libDrakX" (cd $RPM_BUILD_ROOT ; find $dirs1 usr/bin usr/sbin ! -type d -printf "/%%p\n")|egrep -v 'bin/.*harddrake' > %{name}.list (cd $RPM_BUILD_ROOT ; find $dirs1 -type d -printf "%%%%dir /%%p\n") >> %{name}.list -perl -ni -e '/drakbackup|drakfont|gtk|icons|logdrake|net_monitor|pixmaps|printer|XFdrake/ ? print STDERR $_ : print' %{name}.list 2> %{name}-gtk.list +perl -ni -e '/drakbackup|drakfont|drakfloppy|gtk|icons|logdrake|net_monitor|pixmaps|printer|XFdrake/ ? print STDERR $_ : print' %{name}.list 2> %{name}-gtk.list perl -ni -e '/http/ ? print STDERR $_ : print' %{name}.list 2> %{name}-http.list #mdk menu entry @@ -315,6 +315,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http %changelog +- drakfloppy must not be in drakxtools-newt, must now require mkbootdisk + (which is not installed by default anymore) + * Tue Dec 30 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 9.3-14mdk - ugtk2.pm: fix ask_dir dialog (#6152) |