X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dev.spec;h=222378f83b06342a32294391faddc9ca0fefa091;hb=ce4807b033f2b026d44de8013db30df91f139bbb;hp=1820525fd9459ebc94abbdec3b4590080d6b7e3a;hpb=14e81c7cbc1e26a7d4b6d4010abd107e4516b400;p=packages%2Fdev.git

diff --git a/dev.spec b/dev.spec
index 1820525..222378f 100644
--- a/dev.spec
+++ b/dev.spec
@@ -1,20 +1,20 @@
 Summary:	/dev entries
-Summary(fr):	Entrées de /dev.
+Summary(fr):	Entrées de /dev
 Summary(de):	/dev-Einträge
 Summary(pl):	Pliki specjalne /dev/*
 Summary(tr):	/dev dizini
 Name:		dev
 Version:	2.7.7
-Release:	2
-#######		From ftp.redhat.com/rawhide
+Release:	7
 Source:		%{name}-%{version}.tar.gz
 Copyright:	public domain
 Group:		Base
+Group(pl):	Podstawowe
 BuildPrereq:	setup
-# remove shadow if floppy and console group exist in setup
 BuildPrereq:	shadow
 Prereq:		setup
-Buildroot:	/tmp/%{name}-%{version}-root
+Buildarch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Autoreqprov:	no
 
 %description
@@ -25,7 +25,7 @@ contains the most commonly used /dev entries. These files are essential
 for a system to function properly.
 
 %description -l pl
-Wszystkie systemy Unix, jak na przyk³ad Linux, u¿ywaj± plików do przedstawienia 
+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.
@@ -57,14 +57,20 @@ eines Systems unbedingt erforderlich.
 %install
 rm -rf $RPM_BUILD_ROOT
 
+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 
-grep '^floppy:' /etc/group  >/dev/null \
-	|| groupadd -g 19 -r -f floppy >/dev/null
-grep '^console:' /etc/group >/dev/null \
-	|| groupadd -g 20 -f -r console >/dev/null
+#grep '^floppy:' /etc/group  >/dev/null \
+#	|| groupadd -g 19 -r -f floppy >/dev/null
+#grep '^console:' /etc/group >/dev/null \
+#	|| groupadd -g 20 -f -r console >/dev/null
 
 # do some cleanup in build root
 cd $RPM_BUILD_ROOT
@@ -85,8 +91,8 @@ done
 %ifarch sparc
 # SPARC specific devices
 ln -s sunmouse mouse
-mknod kbd c 11 0
-mknod openprom c 10 139
+mknode kbd c 11 0
+mknode openprom c 10 139
 chmod 666 fb*
 
 # remove devices that will *never* exist on a SPARC
@@ -98,13 +104,13 @@ rm -f gscd sbpcd0 atibm inportbm logibm psaux
 
 %ifarch m68k                                                                    
 # m68k specific devices                                                         
-mknod amigamouse c 10 4                                                         
-mknod atarimouse c 10 5                                                         
-mknod apollomouse c 10 7                                                        
+mknode amigamouse c 10 4                                                         
+mknode atarimouse c 10 5                                                         
+mknode apollomouse c 10 7                                                        
 ln -s amigamouse mouse                                                          
-mknod fdhd0 b 2 4                                                               
-mknod fdhd1 b 2 5                                                               
-mknod kbd c 11 0                                                                
+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                              
@@ -115,8 +121,10 @@ rm -f gscd sbpcd0 atibm inportbm logibm psaux
 %endif
 
 # Coda support 
-mknod cfs0 c 67 0
+mknode cfs0 c 67 0
 
+# PPP support
+mknode ppp c 108 0
 
 ln -s fb0 fb0current
 ln -s fb1 fb1current
@@ -128,66 +136,87 @@ ln -s fb6 fb6current
 ln -s fb7 fb7current
 
 # watchdog support
-mknod watchdog c 10 130 
+mknode watchdog c 10 130 
 
 # route 
-mknod route c 36 0
+mknode route c 36 0
 
 #ALSA support
 rm -f mixer*
-mknod mixer0 c 14 0
-mknod mixer1 c 14 16
-mknod mixer2 c 14 32
-mknod mixer3 c 14 48
+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 -s midi00 midi
 
 rm -f dsp*
-mknod dsp0 c 14 3
-mknod dsp1 c 14 19
-mknod dsp2 c 14 35
-mknod dsp3 c 14 51
+mknode dsp0 c 14 3
+mknode dsp1 c 14 19
+mknode dsp2 c 14 35
+mknode dsp3 c 14 51
 ln -s dsp0 dsp
 
 rm -f audio*
-mknod audio0 c 14 4
-mknod audio1 c 14 20
-mknod audio2 c 14 36
-mknod audio3 c 14 52
+mknode audio0 c 14 4
+mknode audio1 c 14 20
+mknode audio2 c 14 36
+mknode audio3 c 14 52
 ln -s audio0 audio
 
-mknod adsp0 c 14 12
-mknod adsp1 c 14 28
-mknod adsp2 c 14 44
-mknod adsp3 c 14 60
+mknode adsp0 c 14 12
+mknode adsp1 c 14 28
+mknode adsp2 c 14 44
+mknode adsp3 c 14 60
 ln -s adsp0 adsp
 
-mknod dmfm0 c 14 10
-mknod dmfm1 c 14 26
-mknod dmfm2 c 14 42
-mknod dmfm3 c 14 58
+mknode dmfm0 c 14 10
+mknode dmfm1 c 14 26
+mknode dmfm2 c 14 42
+mknode dmfm3 c 14 58
 
-mknod dmmidi0 c 14 9
-mknod dmmidi1 c 14 25
-mknod dmmidi2 c 14 41
-mknod dmmidi3 c 14 57
+mknode dmmidi0 c 14 9
+mknode dmmidi1 c 14 25
+mknode dmmidi2 c 14 41
+mknode dmmidi3 c 14 57
 
-mknod music c 14 8
+mknode music c 14 8
 
-mknod admmidi0 c 14 14
-mknod admmidi1 c 14 30 
-mknod admmidi2 c 14 46
-mknod admmidi3 c 14 62
+mknode admmidi0 c 14 14
+mknode admmidi1 c 14 30 
+mknode admmidi2 c 14 46
+mknode admmidi3 c 14 62
 
-mknod amidi0 c 14 13
-mknod amidi1 c 14 29
-mknod amidi2 c 14 45
-mknod amidi3 c 14 61
+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 -s music sequencer2
 
+#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
+mknode ipstate c 95 2
+
 #temporary
 install -d $RPM_BUILD_ROOT/proc/asound
 touch $RPM_BUILD_ROOT/proc/asound/snd
@@ -195,29 +224,23 @@ touch $RPM_BUILD_ROOT/proc/asound/snd
 ln -s ../proc/asound/snd snd
 
 # prepared for SysVinit
-mknod initctl p
+mknode initctl p
 
 #prepared for Log Daemon
 mkfifo --mode=666 syslog
 
-%pre
-# if setup contains groups floppy and console this mayby obsoletes
-%{_sbindir}/groupadd -g 19 -r -f floppy
-%{_sbindir}/groupadd -g 20 -r -f console
-
-%post
-if [ -f /etc/fstab ] ; then
-  # add /dev/pts to fstab if fstab exists (install2 does it during install)
-  if grep 'devpts' /etc/fstab >/dev/null 2>&1 ; then : ; else
-    # note that we do not disallow comments; we wish to allow people
-    # to comment it out if they so desire.
-    TMP=$(mktemp /tmp/fstab.XXXXXX)
-    sed '/\/proc/a\
-none                    /dev/pts                devpts  mode=0622       0 0
-        ' < /etc/fstab > $TMP && mv -f $TMP /etc/fstab || { echo "failed to add devpts filesystem to /etc/fstab" 1>&2 ; exit 1 ; }
-    rm -f $TMP
-  fi
-fi
+#knfsd char dev
+mknode nfsd_netlink c 36 4
+
+#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
+
+#ipsec character device
+mknod ipsec c 36 10
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -236,32 +259,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(664,root,root) /dev/atibm
 
-%config(noreplace) %verify(not link) %attr(662,root, sys) /dev/audio
-%attr(662,root, sys) /dev/audio?*
+%config(noreplace) %verify(not link) %attr(660,root, audio) /dev/audio
+%attr(660,root, audio) /dev/audio?*
 
 %attr(664,root,root) /dev/aztcd
 
-
 #b#
 %attr(664,root,root) /dev/bpcd
 
 #c#
-%attr(600,root,root)	/dev/capi*
-%attr(664,root,root)    /dev/cdu31a
-%attr(640,root,disk)    /dev/cdu535
-%attr(600,root,root)    /dev/cfs0
-%attr(664,root,root)    /dev/cm206cd
+%attr(600,root,root) /dev/capi*
+%attr(664,root,root) /dev/cdu31a
+%attr(640,root,disk) /dev/cdu535
+%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(664,root,root) /dev/cui*
+%attr(600,root,root) /dev/cum*
 
 #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(662,root, sys) /dev/dsp
-%attr(662,root, sys) /dev/dsp?*
+%config(noreplace) %verify(not link) %attr(660,root, audio) /dev/dsp
+%attr(660,root, audio) /dev/dsp?*
 
 #e#
 %attr(600,root,root) /dev/enskip
@@ -269,7 +291,7 @@ rm -rf $RPM_BUILD_ROOT
 #f#
 %config(noreplace) %verify(not link) %attr(644,root,root)   /dev/fb
 %attr(644,root,root)   /dev/fb?*
-%attr(664,root,floppy) /dev/fd*
+%attr(660,root,floppy) /dev/fd*
 %config(noreplace) %verify(not link) %attr(666,root,root) /dev/ftape
 %attr(644,root,root)   /dev/full
 
@@ -289,6 +311,7 @@ rm -rf $RPM_BUILD_ROOT
 %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(600,root,root) /dev/isctl
@@ -305,7 +328,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,kmem) /dev/kmem
 
 #l#
-#%attr(666,root,root) /dev/log
 %attr(664,root,root) /dev/logibm
 %attr(660,root,disk) /dev/loop*
 
@@ -316,15 +338,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,kmem) /dev/mem
 %config(noreplace) %verify(not link) %attr(662,root,sys) /dev/midi
 %attr(662,root, sys) /dev/midi?*
-%config(noreplace) %verify(not link) %attr(662,root,sys) /dev/mixer
-%attr(662,root, sys) /dev/mixer?*
+%config(noreplace) %verify(not link) %attr(660,root,audio) /dev/mixer
+%attr(660,root, audio) /dev/mixer?*
 %attr(660,root, sys) /dev/mmetfgrab
 %attr(600,root,root) /dev/mpu401*
 %attr(662,root, sys) /dev/music
+%attr(600,root, root) /dev/md*
 
 #n#
 %attr(660,root,disk) /dev/nb*
 %config(noreplace) %verify(not link) %attr(666,root,root) /dev/nftape
+%attr(600,root,root) /dev/nfsd_netlink
 %attr(660,root,disk) /dev/nht*
 %attr(660,root,disk) /dev/nqft*
 %attr(660,root,disk) /dev/nrawqft*
@@ -347,6 +371,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(600,root,root) /dev/pg*
 
 %attr(640,root,kmem) /dev/port
+%attr(644,root,root) /dev/ppp
 %attr(600,root,root) /dev/printer
 %attr(664,root,root) /dev/psaux
 
@@ -408,6 +433,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(666,root,root) /dev/std*
 
 %attr(664,root,root) /dev/sunmouse
+%attr(664,root,root) /dev/svga*
 %attr(666,root,root) /dev/syslog
 %attr(600,root,root) /dev/systty
 
@@ -437,7 +463,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(600,root,root) /dev/ttyP*
 %attr(600,root,root) /dev/ttyR*
 
-%attr(644,root,root) /dev/ttyS*
+%attr(664,root, ttyS) /dev/ttyS*
 
 %attr(666,root, tty) /dev/ttya*
 %attr(666,root, tty) /dev/ttyb*
@@ -474,36 +500,3 @@ rm -rf $RPM_BUILD_ROOT
 #z#
 %attr(666,root,root) /dev/zero
 %attr(660,root,disk) /dev/zqft*
-
-%changelog
-* Thu Apr 29 1999 Artur Wiget <wiget@pld.org.pl>
-  [2.7.7-2]
-- upgrade to 2.7.7  
-- removed creating already created devices
-- added more devices in %%files
-
-* Mon Apr 27 1999 Wojciech "Sas" Ciêciwa <cieciwa@alpha.zarz.agh.edu.pl>
-  [2.7.3-2]
-- added /dev/initctl,
-- added pts device to /etc/fstab,
-- added /dev/syslog.
-
-* Mon Apr 26 1999 Wojciech "Sas" Ciêciwa <cieciwa@alpha.zarz.agh.edu.pl>
-  [2.7.3-1]
-- upgrade to 2.7.3,
-- removed /dev/log, /dev/cua[0-3].
-
-* Tue Apr 20 1999 Artur Frysiak <wiget@pld.org.pl>
-  [2.5.9-3]
-- compiled on rpm 3
-- fixed framebuffer support
-- added coda support
-
-* Sat Dec 12 1998 Sergiusz Paw³owicz <ser@hyperreal.art.pl>
-  [2.5.9-1d]
-- added polish translation to spec (regards to PLD Team),
-- added handles to Unix98 pty support,
-- added handles to framebuffer support,
-- revised spec file, adding group 'floppy' removed.
-- removed initctl -- SysVinit provides it.
-- start at RH spec file.