diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-05 16:42:29 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-05 16:42:29 +0000 |
| commit | 1966dd865a5daa8c93a9ee98b7c3f1af8b4081ec (patch) | |
| tree | e471ba089dcb4b80ef8ccfb28af8de4ecc04daec | |
| parent | 935a1aab74f854bfb013be5957d1eb8ef22a7401 (diff) | |
| download | drakx-1966dd865a5daa8c93a9ee98b7c3f1af8b4081ec.tar drakx-1966dd865a5daa8c93a9ee98b7c3f1af8b4081ec.tar.gz drakx-1966dd865a5daa8c93a9ee98b7c3f1af8b4081ec.tar.bz2 drakx-1966dd865a5daa8c93a9ee98b7c3f1af8b4081ec.tar.xz drakx-1966dd865a5daa8c93a9ee98b7c3f1af8b4081ec.zip | |
- s/PCI/HW/
- add rio500
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/rpmsrate | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 1fa3b6a5b..db0c85780 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -604,7 +604,7 @@ sub read_rpmsrate { while ($flag =~ s,^\s*(("[^"]*"|[^"\s]*)*)\s+,$1,) {} my $ok = 0; $flag = join('||', grep { - if (my ($inv, $p) = /^(!)?PCI"(.*)"/) { + if (my ($inv, $p) = /^(!)?HW"(.*)"/) { ($inv xor detect_devices::matching_desc($p)) and $ok = 1; 0; } else { diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate index 36ba0e1d6..037b8625a 100644 --- a/perl-install/share/rpmsrate +++ b/perl-install/share/rpmsrate @@ -54,6 +54,7 @@ SOUND playmidi playmidi-X11 space_sounds timidity-instruments xmms-esd xmms-kjofol-skins xmms-mikmod xmms-more-vis-plugins 3 GNOME gnome-audio-extra + 2 rio500 ACCESSIBILITY 2 gtkeyboard @@ -265,6 +266,9 @@ SCANNER PHOTO 5 gphoto +HW"Rio 500" + 4 rio500 + DATABASES 5 postgresql 3 MySQL-client MySQL-shared postgresql @@ -297,7 +301,7 @@ GAMES 3D 4 spacecup chromium tuxracer csmash gltron - 5 !PCI"Riva.*128" !PCI"Rage X[CL]" !PCI"Rage Mobility (?:P\/M|L) " !PCI"3D Rage (?:LT|Pro)" # XF3 3D + 5 !HW"Riva.*128" !HW"Rage X[CL]" !HW"Rage Mobility (?:P\/M|L) " !HW"3D Rage (?:LT|Pro)" # XF3 3D bzflag DEVELOPMENT @@ -439,9 +443,9 @@ SYSTEM 4 NIS yp-tools 3 PCMCIA irda-utils - 4 PCI"Voodoo 5" Glide_V5 - PCI"Voodoo (3|Banshee)" Glide_V3-DRI - PCI"Voodoo" XFree86-glide-module + 4 HW"Voodoo 5" Glide_V5 + HW"Voodoo (3|Banshee)" Glide_V3-DRI + HW"Voodoo" XFree86-glide-module 4 LOCALES"ar" || LOCALES"fa" || LOCALES"he" || LOCALES"yi" acon |