X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdev.git;a=blobdiff_plain;f=dev.spec;h=4511dcd6d1a1b0c7230bf76bc1a9885e9db2a1d4;hp=4347d552d5f9d64174c6b30c1b0e5eef5f0f3a3c;hb=ca712632f68e6d5492aafacf16c4f1ca96d65d76;hpb=93c3dbe000a838a77d6ec2a716e30699b0ccf289

diff --git a/dev.spec b/dev.spec
index 4347d55..4511dcd 100644
--- a/dev.spec
+++ b/dev.spec
@@ -1,22 +1,24 @@
 Summary:	/dev entries
-Summary(fr):	Entrées de /dev
 Summary(de):	/dev-Einträge
+Summary(fr):	Entrées de /dev
 Summary(pl):	Pliki specjalne /dev/*
 Summary(tr):	/dev dizini
 Name:		dev
-Version:	2.7.7
-Release:	9
-Source0:	%{name}-%{version}.tar.gz
-Copyright:	public domain
+Version:	2.8.0
+Release:	34
+License:	Public Domain
 Group:		Base
-Group(pl):	Podstawowe
-BuildPrereq:	setup
-BuildPrereq:	shadow
-Prereq:		setup
-Buildarch:	noarch
+Source0:	%{name}-%{version}.tar.gz
+# Source0-md5: 758636059b5d98ab63c3b8093a3c18da
+BuildRequires:	setup
+BuildRequires:	shadow
+PreReq:		setup >= 2.4.1-2
+Provides:	devfs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Autoreqprov:	no
 
+%define		perm_cdrom	660,root,disk
+
 %description
 Unix and unix like systems (including Linux) use file system entries
 to represent devices attached to the machine. All of these entries are
@@ -24,12 +26,12 @@ in the /dev tree (though they don't have to be), and this package
 contains the most commonly used /dev entries. These files are
 essential for a system to function properly.
 
-%description -l pl
-Wszystkie systemy unixowe, w tym Linux, u¿ywaj± plików do
-przedstawiania urz±dzeñ pod³±czonych do komputera. Wszystkie te pliki
-znajduj± siê zwykle w katalogu /dev. Pakiet ten zawiera wiêkszo¶æ
-popularnych plików specjalnych, s± one jedn± z wa¿niejszych czê¶ci
-prawid³owo dzia³aj±cego systemu operacyjnego.
+%description -l de
+Unix und Unix-ähnliche Systeme (inkl. Linux) verwenden Dateisystem-
+Einträge zum Darstellen angeschlossener Geräte. Diese Einträge
+befinden sich (nicht notwendigerweise) im Verzeichnis /dev. Dieses
+Paket enthält die üblichsten /dev-Einträge. Diese Dateien sind für das
+Funktionieren eines Systems unbedingt erforderlich.
 
 %description -l fr
 Unix et les systèmes apparentés (dont Linux) utilise des fichiers pour
@@ -38,6 +40,13 @@ sont dans l'arborescence /dev (ce n'est pas obligatoire). Ce paquetage
 contient les entrées /dev les plus courantes. Elles sont essentielles
 pour qu'un système fonctionne correctement.
 
+%description -l pl
+Wszystkie systemy klasy unices, w tym Linux, u¿ywaj± plików do
+przedstawiania urz±dzeñ pod³±czonych do komputera. Wszystkie te pliki
+znajduj± siê zwykle w katalogu /dev. Pakiet ten zawiera wiêkszo¶æ
+popularnych plików specjalnych, s± one jedn± z wa¿niejszych czê¶ci
+prawid³owo dzia³aj±cego systemu operacyjnego.
+
 %description -l tr
 Unix ve Unix benzeri sistemler (Linux da dahil olmak üzere), makinaya
 baðlý aygýtlarý göstermek için özel dosyalar kullanýrlar. Bu özel
@@ -45,29 +54,22 @@ dosyalar
 kullanýlan /dev dosyalarýný içerir. Bu dosyalar, bir sistemin düzgün
 olarak iþleyebilmesi için temel gereksinimlerdendir.
 
-%description -l de
-Unix und Unix-ähnliche Systeme (inkl. Linux) verwenden Dateisystem-
-Einträge zum Darstellen angeschlossener Geräte. Diese Einträge
-befinden sich (nicht notwendigerweise) im Verzeichnis /dev. Dieses
-Paket enthält die üblichsten /dev-Einträge. Diese Dateien sind für das
-Funktionieren eines Systems unbedingt erforderlich.
-
 %prep
 %setup -q -c -T
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/dev/cpu/{0,1,2,3,4,5,6,7}/
 
-mknode() { 
-# [ -e $1 ] || mknod $1 $2 $3 $4 
-    rm -f $1
-    mknod $1 $2 $3 $4 
+mknode() {
+# [ -e $1 ] || mknod $1 $2 $3 $4
+	rm -f $1
+	mknod $1 $2 $3 $4
 }
 
-install -d $RPM_BUILD_ROOT
 
-#add group for floppy and console
-# if setup contains this group then remove next 4 lines 
+# add group for floppy and console
+# if setup contains this group then remove next 4 lines
 #grep '^floppy:' /etc/group >/dev/null \
 #	|| groupadd -g 19 -r -f floppy >/dev/null
 #grep '^console:' /etc/group >/dev/null \
@@ -82,95 +84,112 @@ cd dev
 # tar doesn't save some permissions unless the p option is used
 # this code protects against dev package updaters forgetting to
 # use the p option when unpacking the souce tarball.
-for dev in zero null tty ttyp0 ; do
-  if [ ! $(ls -l $dev | awk '{print $1}') = crw-rw-rw- ] ; then
-    echo bad permissions on device $dev 1>&2
-    exit 1
-  fi
+for dev in zero null tty ttyp0; do
+	if [ ! $(ls -l $dev | awk '{print $1}') = crw-rw-rw- ]; then
+		echo bad permissions on device $dev 1>&2
+		exit 1
+	fi
 done
 
 %ifarch sparc
 # SPARC specific devices
-ln -s sunmouse mouse
-mknode kbd c 11 0
+ln -sf sunmouse mouse
 mknode openprom c 10 139
-chmod 666 fb*
+%endif
 
-# remove devices that will *never* exist on a SPARC
-rm -f hd* aztcd mcd sbpcd1 cdu31a sbpcd2 scd3
-rm -f sjcd cdu535 sbpcd3 sonycd cm206cd sbpcd
-rm -f gscd sbpcd0 atibm inportbm logibm psaux
+%ifarch m68k
+# m68k specific devices
+mknode amigamouse c 10 4
+mknode atarimouse c 10 5
+mknode apollomouse c 10 7
+ln -sf amigamouse mouse
+mknode fdhd0 b 2 4
+mknode fdhd1 b 2 5
+%endif
 
+%ifarch ppc
+# RTC and Mouse devices related to ppc
+mknode adb c 56 0
+mknode adbmouse c 10 10
+ln -sf adbmouse mouse
+# PMU
+mknode pmu c 10 154
+# mol networking 
+mknode sheep_net c 10 198
 %endif
 
-%ifarch m68k                                                                    
-# m68k specific devices                                                         
-mknode amigamouse c 10 4                                                         
-mknode atarimouse c 10 5                                                         
-mknode apollomouse c 10 7                                                        
-ln -s amigamouse mouse                                                          
-mknode fdhd0 b 2 4                                                               
-mknode fdhd1 b 2 5                                                               
-mknode kbd c 11 0                                                                
-chmod 666 fb*                                                                   
-                                                                                
-# remove devices that will *never* exist on a m68k                              
-rm -f hd* aztcd mcd sbpcd1 cdu31a sbpcd2 scd3                                   
-rm -f sjcd cdu535 sbpcd3 sonycd cm206cd sbpcd                                   
-rm -f gscd sbpcd0 atibm inportbm logibm psaux                                   
-                                                                                
+%ifarch sparc m68k
+# common sparc & m68k specific devices
+mknode kbd c 11 0
+chmod 666 fb*
+# remove devices that will *never* exist on a SPARC or m68k
+rm -f aztcd mcd sbpcd* cm206cd cdu31a cdu535 sonycd sjcd gscd
+rm -f atibm inportbm logibm psaux
 %endif
 
-# Coda support 
+# Coda support
 mknode cfs0 c 67 0
 
 # PPP support
 mknode ppp c 108 0
 
-ln -s fb0 fb0current
-ln -s fb1 fb1current
-ln -s fb2 fb2current
-ln -s fb3 fb3current
-ln -s fb4 fb4current
-ln -s fb5 fb5current
-ln -s fb6 fb6current
-ln -s fb7 fb7current
+for i in 0 1 2 3 4 5 6 7; do
+	ln -sf fb$i fb${i}current
+done
 
 # watchdog support
-mknode watchdog c 10 130 
+mknode watchdog c 10 130
+mknode temperature c 10 131
+
+# nvram
+mknode nvram c 10 144
+
+# agpgart
+mknode agpgart c 10 175
+
+%ifarch %{ix86}
+# toshiba support
+mknode toshiba c 10 181
+mknode cpu/microcode c 10 184
+%endif
+for i in 0 1 2 3 4 5 6 7
+do
+	mknode cpu/$i/cpuid c 203 $i
+	mknod cpu/$i/msr c 202 $i
+done
 
-# route 
+# route
 mknode route c 36 0
 
-#ALSA support
+# ALSA support
 rm -f mixer*
 mknode mixer0 c 14 0
 mknode mixer1 c 14 16
 mknode mixer2 c 14 32
 mknode mixer3 c 14 48
-ln -s mixer0 mixer
+ln -sf mixer0 mixer
 
-ln -s midi00 midi
+ln -sf midi00 midi
 
 rm -f dsp*
 mknode dsp0 c 14 3
 mknode dsp1 c 14 19
 mknode dsp2 c 14 35
 mknode dsp3 c 14 51
-ln -s dsp0 dsp
+ln -sf dsp0 dsp
 
 rm -f audio*
 mknode audio0 c 14 4
 mknode audio1 c 14 20
 mknode audio2 c 14 36
 mknode audio3 c 14 52
-ln -s audio0 audio
+ln -sf audio0 audio
 
 mknode adsp0 c 14 12
 mknode adsp1 c 14 28
 mknode adsp2 c 14 44
 mknode adsp3 c 14 60
-ln -s adsp0 adsp
+ln -sf adsp0 adsp
 
 mknode dmfm0 c 14 10
 mknode dmfm1 c 14 26
@@ -185,7 +204,7 @@ mknode dmmidi3 c 14 57
 mknode music c 14 8
 
 mknode admmidi0 c 14 14
-mknode admmidi1 c 14 30 
+mknode admmidi1 c 14 30
 mknode admmidi2 c 14 46
 mknode admmidi3 c 14 62
 
@@ -193,9 +212,9 @@ mknode amidi0 c 14 13
 mknode amidi1 c 14 29
 mknode amidi2 c 14 45
 mknode amidi3 c 14 61
-ln -s amidi0 amidi
+ln -sf amidi0 amidi
 
-ln -s music sequencer2
+ln -sf music sequencer2
 
 mknode aloadC0 c 116 0
 mknode aloadC1 c 116 32
@@ -208,143 +227,301 @@ mknode amixer1 c 14 27
 mknode amixer2 c 14 43
 mknode amixer3 c 14 59
 
-#video4linux support
+# video4linux support
 mknode video0 c 81 0
 mknode radio0 c 81 64
 mknode vtx0 c 81 192
 mknode vbi0 c 81 224
-ln -s video0 video
-ln -s radio0 radio
-ln -s vtx0 vtx
-ln -s vbi0 vbi
-
-#raid
-mknode md0 b 9 0
-mknode md1 b 9 1
-mknode md2 b 9 2
-mknode md3 b 9 3
-mknode md4 b 9 4
-mknode md5 b 9 5
-mknode md6 b 9 6
-mknode md7 b 9 7
-mknode md8 b 9 8
-mknode md9 b 9 9
-mknode md10 b 9 10
-mknode md11 b 9 11
-mknode md12 b 9 12
-mknode md13 b 9 13
-mknode md14 b 9 14
-mknode md15 b 9 15
-
-#netfilter
+ln -sf video0 video
+ln -sf radio0 radio
+ln -sf vtx0 vtx
+ln -sf vbi0 vbi
+
+# em8300 (dxr3 and h+) support
+mknode em8300-0    c 121 0
+mknode em8300_mv-0 c 121 1
+mknode em8300_ma-0 c 121 2
+mknode em8300_sp-0 c 121 3
+ln -sf em8300-0    em8300
+ln -sf em8300_mv-0 em8300_mv
+ln -sf em8300_ma-0 em8300_ma
+ln -sf em8300_sp-0 em8300_sp
+
+# more ide channels
+mknode hdi b 56 0
+mknode hdj b 56 64
+mknode hdk b 57 0
+mknode hdl b 57 64
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+	mknode hdi$i b 56 $i
+	mknode hdj$i b 56 $(( $i + 64 ))
+	mknode hdk$i b 57 $i
+	mknode hdl$i b 57 $(( $i + 64 ))
+done
+
+# osst (ide OnStream Tape drives)
+
+mknode osst0 c 206 0
+mknode osst1 c 206 1
+
+# i2o disks
+mkdir i2o
+mknode i2o/ctl c 10 166
+min=0
+for d in a b c d e f g h i j k l m n o p; do
+	mknode i2o/hd$d b 80 $min
+	for p in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+		mknode i2o/hd${d}${p} b 80 $(($min + $p))
+	done
+	min=$(($min + 16))
+done
+
+# dpt i2o
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17; do
+	mknode dpti$i b 151 $i
+done
+
+# raid
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+	mknode md$i b 9 $i
+done
+# ataraid
+mkdir ataraid
+for d in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+	mknode ataraid/d$d b 114 $(( $d * 16 ))
+	for p in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+		mknode ataraid/d${d}p${p} b 114 $(( $d * 16 + $p ))
+	done
+done
+# Compaq Next Generation Drive Array
+mkdir cciss
+for c in 0 1 2 3 4 5 6 7; do
+	for d in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+		mknode cciss/c${c}d$d b $((104 + $c)) $(( $d * 16 ))
+		for p in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+			mknode cciss/c${c}d${d}p$p b $((104 + $c)) $(( $d * 16 + $p ))
+		done
+	done
+done
+
+# InterMezzo fs cache managers
+mknode intermezzo0 c 185 0
+mknode intermezzo1 c 185 1
+mknode intermezzo2 c 185 2
+mknode intermezzo3 c 185 3
+
+# netfilter
 mknode ipstate c 95 2
 
-#temporary
+# arpd
+mknode arpd c 36 8
+
+# pt_drv
+mknode pt_drv c 40 0
+
+# temporary
 install -d $RPM_BUILD_ROOT/proc/asound
-touch $RPM_BUILD_ROOT/proc/asound/dev
+> $RPM_BUILD_ROOT/proc/asound/dev
 
-ln -s ../proc/asound/dev snd
+ln -sf ../proc/asound/dev snd
 
 # prepared for SysVinit
 mknode initctl p
 
-#prepared for Log Daemon
+# prepared for Log Daemon
 mkfifo --mode=666 syslog
 
-#libsvga char dev helpers
-mknod svga c 209 0
-mknod svga1 c 209 1
-mknod svga2 c 209 2
-mknod svga3 c 209 3
-mknod svga4 c 209 4
+# libsvga char dev helpers
+mknode svga c 209 0
+mknode svga1 c 209 1
+mknode svga2 c 209 2
+mknode svga3 c 209 3
+mknode svga4 c 209 4
 
-#ipsec character device
-mknod ipsec c 36 10
+# ipsec character device
+mknode ipsec c 36 10
+
+# TUN/TAP devices for 2.2+tun patch
+for i in 0 1 2 3 4 5 6 7 8 9; do
+	mknode tun$i c 90 $i
+done
+# TAP/TUN for 2.4
+install -d $RPM_BUILD_ROOT/dev/net
+mknode net/tun c 10 200
 
 # raw io devices
 mknode rawctl c 162 0
 mkdir $RPM_BUILD_ROOT/dev/raw
 minor=1
 while [ "$minor" -ne 256 ]; do
-    mknode "raw/raw$minor" c 162 $minor
-    minor=$(($minor +1))
+	mknode "raw/raw$minor" c 162 $minor
+	minor=$(($minor +1))
 done
 
 # ltmodem
-mknod ttyLT0 c 62 64
+mknode ttyLT0 c 62 64
+# Smart Link soft modem
+mknode ttySL0 c 212 0
+
+# XFree86-nvidia-kernel a.k.a. kernel(-smp)-video-nvidia
+for i in 0 1 2 3; do
+	mknode nvidia$i c 195 $i
+done
+mknode nvidiactl c 195 255
+
+# kernel 2.4 requires /dev/js* with major 13
+for f in 0 1 2 3; do
+	mv -f js$f oldjs$f
+	mknode js$f c 13 $f
+done
+
+# irda-utils
+mknode ircomm0 c 161 0
+mknode ircomm1 c 161 1
+mknode irlpt0 c 161 16
+mknode irlpt1 c 161 17
+
+# lirc
+mknode lirc c 61 0
+mknode lircm p
+
+# usb
+mkdir input usb
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+	mknode input/js$i c 13 $i
+	mknode input/mouse$i c 13 $(( $i + 32 ))
+	mknode input/event$i c 13 $(( $i + 64 ))
+	mknode usb/ttyACM$i c 166 $i
+	mknode usb/lp$i c 180 $i
+	mknode usb/scanner$i c 180 $(( $i + 48 ))
+	mknode usb/ez$i c 180 $(( $i + 64 ))
+	mknode usb/ttyUSB$i c 188 $i
+	mknode usb/ttyUB$i c 216 $i
+done
+mknode input/mice c 13 63
+mknode usb/rio500 c 180 64
+mknode usb/tkpanel0 c 180 180
+mknode usb/tkpanel1 c 180 181
+
+# rfcomm (Bluetooth stack) - the same numbers as ttyUBx,
+# but rfcomm refers to these names
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+	mknode rfcomm$i c 216 $i
+done
+
+# more ttys (12 may be not sufficient)
+for i in 13 14 15 16 17 18 19 20 21 22 23 24; do
+	mknode tty$i c 4 $i
+done
 
-%clean 
+# For Capsel:
+mknode capsel c 240 0
+
+# Some PLD-folklor :)
+ln -sf null drzewo
+
+# For mplayer helper:
+mknode dhahelper c 180 0
+
+# pktcdvd support:
+mknode pktcdvd0 b 97 0
+mknode pktcdvd1 b 97 1
+mknode pktcdvd2 b 97 2
+mknode pktcdvd3 b 97 3
+mknode pktcdvd4 b 97 4
+
+# To allow have the same devs like on devfs(links in this dirs):
+mkdir $RPM_BUILD_ROOT/dev/cdroms
+mkdir $RPM_BUILD_ROOT/dev/discs
+
+%clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %defattr(644,root,root,755)
 
 #a#
-%attr(662,root, sys) /dev/admmidi*
-
-%config(noreplace) %verify(not link) %attr(666,root, sys) /dev/adsp
-%attr(662,root, sys) /dev/adsp?*
+%dir /dev/ataraid
+%attr(660,root,disk) /dev/ataraid/*
+%attr(660,root,audio) /dev/admmidi*
 
-%config(noreplace) %verify(not link) %attr(662,root,root) /dev/amidi
-%attr(662,root,root) /dev/amidi?*
+%config(noreplace) %verify(not link) %attr(660,root,audio) /dev/adsp
+%attr(660,root,audio) /dev/adsp?*
 
-%attr(664,root,root) /dev/atibm
+%config(noreplace) %verify(not link) %attr(660,root,audio) /dev/amidi
+%attr(660,root,audio) /dev/amidi?*
 
-%config(noreplace) %verify(not link) %attr(660,root, audio) /dev/audio
-%attr(660,root, audio) /dev/audio?*
+%attr(644,root,root) /dev/agpgart
+%attr(660,daemon,root) /dev/arpd
 
-%attr(664,root,root) /dev/aztcd
+%config(noreplace) %verify(not link) %attr(660,root,audio) /dev/audio
+%attr(660,root,audio) /dev/audio?*
 
 #b#
-%attr(664,root,root) /dev/bpcd
+%attr(%{perm_cdrom}) /dev/bpcd
 
 #c#
 %attr(600,root,root) /dev/capi*
-%attr(664,root,root) /dev/cdu31a
-%attr(640,root,disk) /dev/cdu535
+%dir /dev/cciss
+%attr(660,root,root) /dev/cciss/*
+%attr(%{perm_cdrom}) %dir /dev/cdroms
 %attr(600,root,root) /dev/cfs0
-%attr(664,root,root) /dev/cm206cd
 %attr(660,root,console) /dev/console
 %attr(664,root,root) /dev/cui*
 %attr(600,root,root) /dev/cum*
+%attr(600,root,root) /dev/capsel
 
 #d#
 %attr(600,root,root) /dev/dcbri*
-%attr(660,root, sys) /dev/dcxx*
-%attr(662,root, sys) /dev/dmfm*
-%attr(662,root, sys) /dev/dmmidi*
-%config(noreplace) %verify(not link) %attr(660,root, audio) /dev/dsp
-%attr(660,root, audio) /dev/dsp?*
+%attr(660,root,sys) /dev/dcxx*
+%attr(660,root,disk) %dir /dev/discs
+%attr(660,root,audio) /dev/dmfm*
+%attr(660,root,audio) /dev/dmmidi*
+%attr(666,root,root) /dev/drzewo
+%config(noreplace) %verify(not link) %attr(660,root,audio) /dev/dsp
+%attr(660,root,audio) /dev/dsp?*
+%attr(660,root,video) /dev/dhahelper
 
 #e#
+%attr(660,root,video) /dev/em8300*
 %attr(600,root,root) /dev/enskip
 
 #f#
-%config(noreplace) %verify(not link) %attr(644,root,root)   /dev/fb
-%attr(644,root,root)   /dev/fb?*
+%config(noreplace) %verify(not link) %attr(644,root,root) /dev/fb
+%attr(664,root,video) /dev/fb?*
 %attr(660,root,floppy) /dev/fd*
 %config(noreplace) %verify(not link) %attr(666,root,root) /dev/ftape
-%attr(644,root,root)   /dev/full
+%attr(644,root,root) /dev/full
 
 #g#
-%attr(664,root,root) /dev/gscd
 
 #h#
-%attr(660,root,disk) /dev/hd*
 %attr(660,root,disk) /dev/ht0
 
 #i#
 %attr(600,root,root) /dev/i2c*
+%dir /dev/i2o
+%attr(600,root,root) /dev/i2o/ctl
+%attr(660,root,disk) /dev/i2o/hd*
 %dir /dev/ida
 %attr(660,root,disk) /dev/ida/*
 %attr(600,root,root) /dev/initctl
-%attr(664,root,root) /dev/inportbm
+%dir /dev/input
+%attr(660,root,root) /dev/input/event*
+%attr(660,root,sys) /dev/input/js*
+%attr(660,root,root) /dev/input/mice
+%attr(660,root,root) /dev/input/mouse*
+%attr(600,root,root) /dev/intermezzo*
 %attr(600,root,root) /dev/ipauth
 %attr(600,root,root) /dev/ipl
 %attr(600,root,root) /dev/ipnat
 %attr(600,root,root) /dev/ipstate
 %attr(600,root,root) /dev/ippp*
-%attr(660,root, sys) /dev/iscc*
+%attr(664,root,ttyS) /dev/ircomm0
+%attr(664,root,ttyS) /dev/ircomm1
+%attr(664,root,ttyS) /dev/irlpt0
+%attr(664,root,ttyS) /dev/irlpt1
+%attr(660,root,sys) /dev/iscc*
 %attr(600,root,root) /dev/isctl
 %attr(600,root,root) /dev/isdn?
 %attr(600,root,root) /dev/isdn??
@@ -353,32 +530,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(444,root,root) /dev/isdninfo
 
 #j#
-%attr(660,root, sys) /dev/js*
+%attr(660,root,sys) /dev/js*
 
 #k#
 %attr(640,root,kmem) /dev/kmem
 
 #l#
-%attr(664,root,root) /dev/logibm
+%attr(660,root,root) /dev/lirc
+%attr(660,root,root) /dev/lircm
 %attr(660,root,disk) /dev/loop*
-
-%attr(660,root,daemon) /dev/lp*
-%attr(664,root,ttyS) /dev/ttyLT*
+%attr(660,root,lp) /dev/lp*
 
 #m#
-%attr(640,root,disk) /dev/mcd
 %attr(640,root,kmem) /dev/mem
-%config(noreplace) %verify(not link) %attr(662,root,sys) /dev/midi
-%attr(662,root,audio) /dev/midi?*
+%config(noreplace) %verify(not link) %attr(660,root,audio) /dev/midi
+%attr(660,root,audio) /dev/midi?*
 %config(noreplace) %verify(not link) %attr(660,root,audio) /dev/mixer
 %attr(660,root,audio) /dev/mixer?*
-%attr(660,root, sys) /dev/mmetfgrab
+%attr(660,root,sys) /dev/mmetfgrab
 %attr(600,root,root) /dev/mpu401*
 %attr(660,root,audio) /dev/music
-%attr(600,root, root) /dev/md*
+%attr(660,root,disk) /dev/md*
+%attr(660,root,disk) /dev/dpti*
 
 #n#
 %attr(660,root,disk) /dev/nb*
+%dir /dev/net
+%attr(600,root,root) /dev/net/tun
 %config(noreplace) %verify(not link) %attr(666,root,root) /dev/nftape
 %attr(660,root,disk) /dev/nht*
 %attr(660,root,disk) /dev/nqft*
@@ -387,32 +565,39 @@ rm -rf $RPM_BUILD_ROOT
 %attr(660,root,disk) /dev/nst*
 %attr(660,root,disk) /dev/ntpqic*
 %attr(666,root,root) /dev/null
+%attr(666,root,root) /dev/nvidia*
+%attr(600,root,root) /dev/nvram
 %attr(660,root,disk) /dev/nzqft*
 
 #o#
-%attr(664,root,root) /dev/optcd
+%attr(%{perm_cdrom}) /dev/optcd
+%attr(660,root,sys) /dev/oldjs*
+%attr(660,root,disk) /dev/osst?
 
 #p#
-%attr(640,root,daemon) /dev/par?
-%attr(660,root,daemon) /dev/parport*
+%attr(660,root,lp) /dev/par?
+%attr(660,root,lp) /dev/parport*
 
-%attr(660,root,disk) /dev/pcd*
+%attr(%{perm_cdrom}) /dev/pcd*
 %attr(660,root,disk) /dev/pd*
 %attr(660,root,disk) /dev/pf*
 %attr(600,root,root) /dev/pg*
 
+%attr(660,root,disk) /dev/pktcdvd*
+
 %attr(640,root,kmem) /dev/port
 %attr(644,root,root) /dev/ppp
 %attr(600,root,root) /dev/printer
-%attr(664,root,root) /dev/psaux
 
 %attr(660,root,disk) /dev/pt0
 %attr(660,root,disk) /dev/pt1
 %attr(660,root,disk) /dev/pt2
 %attr(660,root,disk) /dev/pt3
 
-%attr(666,root, tty) /dev/ptmx
-%attr(666,root, tty) /dev/pty*
+%attr(666,root,tty) /dev/ptmx
+%attr(666,root,tty) /dev/pty*
+
+%attr(666,root,root) /dev/pt_drv
 %dir /dev/pts
 
 #r#
@@ -432,6 +617,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(644,root,root) /dev/random
 %attr(660,root,disk) /dev/rawqft*
+%attr(664,root,ttyS) /dev/rfcomm*
 %attr(660,root,disk) /dev/rft*
 %attr(660,root,audio) /dev/rmidi*
 %attr(660,root,disk) /dev/rmt*
@@ -443,51 +629,54 @@ rm -rf $RPM_BUILD_ROOT
 %dir /dev/raw
 %attr(660,root,disk) /dev/raw/*
 
+%attr(660,root,video) /dev/radio0
+%attr(660,root,video) /dev/radio
+
 #s#
-%attr(640,root,disk) /dev/sbpc*
-%attr(660,root,disk) /dev/scd*
+%attr(%{perm_cdrom}) /dev/scd*
 %attr(660,root,disk) /dev/sd*
 
 %attr(660,root,audio) /dev/sequencer
 %attr(660,root,audio) /dev/sequencer2
 
 %attr(600,root,root) /dev/sg*
-%attr(664,root,root) /dev/sjcd
 %attr(600,root,root) /dev/smtpe*
 
 %attr(444,root,root) /dev/snd
 %attr(666,root,root) /dev/sndstat
 
-%attr(640,root,disk) /dev/sonycd
-
 %attr(600,root,root) /dev/srnd*
 
 %attr(660,root,disk) /dev/st?
 %attr(600,root,root) /dev/staliomem*
 %attr(666,root,root) /dev/std*
 
-%attr(664,root,root) /dev/sunmouse
-%attr(664,root,root) /dev/svga*
+%attr(664,root,video) /dev/svga*
 %attr(666,root,root) /dev/syslog
 %attr(600,root,root) /dev/systty
 
 #t#
 %attr(660,root,disk) /dev/tape*
 %attr(600,root,root) /dev/tlk*
+%ifarch %{ix86}
+%attr(666,root,root) /dev/toshiba
+%dir /dev/cpu
+%attr(666,root,root) /dev/cpu/microcode
+%endif
+%dir /dev/cpu/0
+%dir /dev/cpu/1
+%dir /dev/cpu/2
+%dir /dev/cpu/3
+%dir /dev/cpu/4
+%dir /dev/cpu/5
+%dir /dev/cpu/6
+%dir /dev/cpu/7
+%attr(664,root,root) /dev/cpu/[0-9]/*
 %attr(660,root,disk) /dev/tpqic*
 
 %attr(666,root,root) /dev/tty
 
-%attr(600,root, tty) /dev/tty0
-%attr(600,root, tty) /dev/tty1*
-%attr(600,root, tty) /dev/tty2
-%attr(600,root, tty) /dev/tty3
-%attr(600,root, tty) /dev/tty4
-%attr(600,root, tty) /dev/tty5
-%attr(600,root, tty) /dev/tty6
-%attr(600,root, tty) /dev/tty7
-%attr(600,root, tty) /dev/tty8
-%attr(600,root, tty) /dev/tty9
+%attr(600,root,root) %verify(not user group mode) /dev/tty[0-9]*
 
 %attr(600,root,root) /dev/ttyC*
 %attr(600,root,root) /dev/ttyD*
@@ -497,34 +686,52 @@ rm -rf $RPM_BUILD_ROOT
 %attr(600,root,root) /dev/ttyP*
 %attr(600,root,root) /dev/ttyR*
 
-%attr(664,root, ttyS) /dev/ttyS*
-
-%attr(666,root, tty) /dev/ttya*
-%attr(666,root, tty) /dev/ttyb*
-%attr(666,root, tty) /dev/ttyc*
-%attr(666,root, tty) /dev/ttyd*
-%attr(666,root, tty) /dev/ttye*
-%attr(666,root, tty) /dev/ttyp*
-%attr(666,root, tty) /dev/ttyq*
-%attr(666,root, tty) /dev/ttyr*
-%attr(666,root, tty) /dev/ttys*
-%attr(666,root, tty) /dev/ttyt*
-%attr(666,root, tty) /dev/ttyu*
-%attr(666,root, tty) /dev/ttyv*
-%attr(666,root, tty) /dev/ttyw*
-%attr(666,root, tty) /dev/ttyx*
-%attr(666,root, tty) /dev/ttyy*
-%attr(666,root, tty) /dev/ttyz*
+%attr(664,root,ttyS) /dev/ttyS*
+%attr(664,root,ttyS) /dev/ttyLT*
+
+%attr(666,root,tty) /dev/ttya*
+%attr(666,root,tty) /dev/ttyb*
+%attr(666,root,tty) /dev/ttyc*
+%attr(666,root,tty) /dev/ttyd*
+%attr(666,root,tty) /dev/ttye*
+%attr(666,root,tty) /dev/ttyp*
+%attr(666,root,tty) /dev/ttyq*
+%attr(666,root,tty) /dev/ttyr*
+%attr(666,root,tty) /dev/ttys*
+%attr(666,root,tty) /dev/ttyt*
+%attr(666,root,tty) /dev/ttyu*
+%attr(666,root,tty) /dev/ttyv*
+%attr(666,root,tty) /dev/ttyw*
+%attr(666,root,tty) /dev/ttyx*
+%attr(666,root,tty) /dev/ttyy*
+%attr(666,root,tty) /dev/ttyz*
+%attr(600,root,root) /dev/tun*
 
 #u#
 %attr(644,root,root) /dev/urandom
+%dir /dev/usb
+%attr(660,root,root) /dev/usb/ez*
+%attr(660,root,lp) /dev/usb/lp*
+%attr(660,root,root) /dev/usb/scanner*
+%attr(664,root,ttyS) /dev/usb/rio500
+%attr(664,root,ttyS) /dev/usb/ttyACM*
+%attr(664,root,ttyS) /dev/usb/ttyUB*
+%attr(664,root,ttyS) /dev/usb/ttyUSB*
+%attr(660,root,root) /dev/usb/tkpanel*
 
 #v#
-%attr(620,root,tty) /dev/vcs*
+%attr(620,root,tty) %verify(not user) /dev/vcs*
+
+%attr(660,root,video) /dev/video0
+%attr(660,root,video) /dev/video
+%attr(660,root,video) /dev/vtx0
+%attr(660,root,video) /dev/vtx
+%attr(660,root,video) /dev/vbi0
+%attr(660,root,video) /dev/vbi
 
 #w#
 %attr(600,root,root) /dev/watchdog
-%attr(660,root, sys) /dev/wvisfgrab
+%attr(660,root,sys) /dev/wvisfgrab
 
 #x#
 %attr(660,root,disk) /dev/xd*
@@ -534,3 +741,50 @@ rm -rf $RPM_BUILD_ROOT
 #z#
 %attr(666,root,root) /dev/zero
 %attr(660,root,disk) /dev/zqft*
+
+# only on sparc or m68k
+%ifarch sparc m68k
+# XXX: which permissions???
+%attr(600,root,root) /dev/kbd
+%endif
+
+# only on m68k
+%ifarch m68k
+# XXX: which permissions???
+%attr(664,root,root) /dev/amigamouse
+%attr(664,root,root) /dev/atarimouse
+%attr(664,root,root) /dev/apollomouse
+%endif
+
+# only on ppc
+%ifarch ppc
+%attr(644,root,root) /dev/adb*
+%attr(644,root,root) /dev/mouse
+%attr(644,root,root) /dev/pmu
+%attr(644,root,root) /dev/sheep_net
+%endif
+
+# only on sparc
+%ifarch sparc
+# XXX: which permissions ???
+%attr(600,root,root) /dev/openprom
+%attr(664,root,root) /dev/sunmouse
+%endif
+
+%attr(660,root,disk) /dev/hd*
+# not on sparc or m68k
+%ifnarch sparc m68k
+%attr(664,root,root) /dev/atibm
+%attr(%{perm_cdrom}) /dev/aztcd
+%attr(%{perm_cdrom}) /dev/cdu31a
+%attr(%{perm_cdrom}) /dev/cdu535
+%attr(%{perm_cdrom}) /dev/cm206cd
+%attr(%{perm_cdrom}) /dev/gscd
+%attr(664,root,root) /dev/inportbm
+%attr(664,root,root) /dev/logibm
+%attr(%{perm_cdrom}) /dev/mcd
+%attr(664,root,root) /dev/psaux
+%attr(%{perm_cdrom}) /dev/sbpcd*
+%attr(%{perm_cdrom}) /dev/sjcd
+%attr(%{perm_cdrom}) /dev/sonycd
+%endif