- fixed some dir-s,

- added /opt /var/adm,
- removed all symlinks ( commented out ),
- nie dotykać pakietu setup (bo ...) !

Changed files:
    filesystem.spec -> 1.28

diff --git a/filesystem.spec b/filesystem.spec
index 2ebaa6291bb94860a85fb6e75f6db5119b1cc356..d41f5cf22690d8481dba07df8e5d1c2e64c5a1b5 100644 (file)
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -5,7 +5,7 @@ Summary(pl):    Podstawa uk
 Summary(tr):   Temel dosya sistemi yapýsý
 Name:          filesystem
 Version:       1.5
-Release:       1
+Release:       2
 Copyright:     Public Domain
 Group:         Base
 Group(pl):     Bazowe
@@ -47,40 +47,41 @@ install -d $RPM_BUILD_ROOT/{bin,boot,home/users,opt} \
        $RPM_BUILD_ROOT/lib/{modules,security} \
        $RPM_BUILD_ROOT/{mnt/{floppy,cdrom},proc,root,sbin,tmp} \
        $RPM_BUILD_ROOT/usr/{bin,etc,games,include,sbin,share} \
-       $RPM_BUILD_ROOT%{_datadir}/{dict,doc,info,man,misc,games,fonts} \
+       $RPM_BUILD_ROOT/usr/share/{dict,doc,info,man,misc,games,fonts} \
        $RPM_BUILD_ROOT/usr/{games,lib/games} \
        $RPM_BUILD_ROOT/usr/local/{bin,games,share/{info,man,doc},lib,sbin,src} \
-       $RPM_BUILD_ROOT/var/{local,lock/subsys,log,run,preserve,mail,spool} \
-       $RPM_BUILD_ROOT/var/{games,state,tmp,db,opt}
-
-ln -sf share/man       $RPM_BUILD_ROOT%{_mandir}
-ln -sf share/man       $RPM_BUILD_ROOT/usr/local/man
-ln -sf share/info      $RPM_BUILD_ROOT%{_infodir}
-ln -sf state           $RPM_BUILD_ROOT/var/lib
-ln -sf share/doc       $RPM_BUILD_ROOT/usr/doc
-ln -sf share/doc       $RPM_BUILD_ROOT/usr/local/doc
-ln -sf share/dict      $RPM_BUILD_ROOT/usr/dict
+       $RPM_BUILD_ROOT/var/{local,lock/subsys,log,run,preserve,spool/mail} \
+       $RPM_BUILD_ROOT/var/{games,state,tmp,db,opt,adm} 
+
+#ln -sf share/man      $RPM_BUILD_ROOT/usr/man
+#ln -sf share/man      $RPM_BUILD_ROOT/usr/local/man
+#ln -sf share/info     $RPM_BUILD_ROOT/usr/info
+#ln -sf state          $RPM_BUILD_ROOT/var/lib
+#ln -sf share/doc      $RPM_BUILD_ROOT/usr/doc
+#ln -sf share/doc      $RPM_BUILD_ROOT/usr/local/doc
+#ln -sf share/dict     $RPM_BUILD_ROOT/usr/dict
+#ln -sf  log           $RPM_BUILD_ROOT/var/adm
 
 %pre
-if [ -e %{_mandir} ] && [ ! -L /usr/man ]; then 
-       mkdir -p %{_mandir}
-       cp -a %{_mandir}/* %{_mandir} || :
-       rm -rf %{_mandir}
+if [ -e /usr/man ] && [ ! -L /usr/man ]; then 
+       mkdir -p /usr/share/man
+       cp -a /usr/man/* /usr/share/man || :
+       rm -rf /usr/man
 fi 
 if [ -e /usr/local/man ] && [ ! -L /usr/local/man ]; then 
        mkdir -p /usr/local/share/man
        cp -a /usr/local/man/* /usr/local/share/man || :
        rm -rf /usr/local/man
 fi 
-if [ -e %{_infodir} ] && [ ! -L /usr/info ]; then 
-       mkdir -p %{_infodir}
-       cp -a %{_infodir}/* %{_infodir} || :
-       rm -rf %{_infodir}
-       ln -sf ../../../etc/info-dir %{_infodir}/dir
+if [ -e /usr/info ] && [ ! -L /usr/info ]; then 
+       mkdir -p /usr/share/info
+       cp -a /usr/info/* /usr/share/info || :
+       rm -rf /usr/info
+       ln -sf ../../../etc/info-dir /usr/share/info/dir
 fi 
 if [ -e /usr/doc ] && [ ! -L /usr/doc ]; then 
-       mkdir -p %{_defaultdocdir}
-       cp -a /usr/doc/* %{_defaultdocdir} || :
+       mkdir -p /usr/share/doc
+       cp -a /usr/doc/* /usr/share/doc || :
        rm -rf /usr/doc
 fi 
 if [ -e /usr/local/doc ] && [ ! -L /usr/local/doc ]; then 
@@ -89,8 +90,8 @@ if [ -e /usr/local/doc ] && [ ! -L /usr/local/doc ]; then
        rm -rf /usr/local/doc
 fi 
 if [ -e /usr/dict ] && [ ! -L /usr/dict ]; then 
-       mkdir -p %{_datadir}/dict
-       cp -a /usr/dict/* %{_datadir}/dict || :
+       mkdir -p /usr/share/dict
+       cp -a /usr/dict/* /usr/share/dict || :
        rm -rf /usr/dict
 fi 
 if [ -e /var/lib ] && [ ! -L /var/lib ]; then 
@@ -111,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(755,root,root,755)
-%dir /bin
+/bin
 %attr(700,root,root) /boot
 %dir /etc
 %attr(751,root,root) %dir /etc/security
@@ -122,6 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 /home
 /lib
 /mnt
+/opt
 %attr(555,root,root) /proc
 %attr(700,root,root) /root
 %dir /sbin
@@ -129,17 +131,25 @@ rm -rf $RPM_BUILD_ROOT
 /usr
 %dir /var
 %dir /var/db
-%dir /var/lib
+%dir /var/adm
 %dir /var/local
-%dir /var/lock
+%dir /var/games
+/var/lock
 %attr(751,root,root) /var/log
 %dir /var/run
 %dir /var/preserve
-%dir /var/spool
+/var/spool
 %dir /var/state
+%dir /var/opt
 %attr(1777,root,root) %dir /var/tmp
 
 %changelog
+* Wed May 19 1999 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
+- fixed some directories ... -- look in setup/passwd file ..
+  (wywaliæ ten wpis, przed fina³ow± przebudow± !)
+- added /opt (commercial software) && /var/adm 
+  (wywaliæ wszelkie linkowania, na razie s± zakomentowane)
+ 
 * Thu May  6 1999 Artur Frysiak <wiget@pld.org.pl>
   [1.5-1]
 - modyfications for FHS 2.0.
@@ -173,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
 - added /var/qmail,
 - all symlinks are now as %ghost,
 - added /var/lock/subsys,
-- added /usr/X11R6/man/* & %{_mandir}/man/*,
+- added /usr/X11R6/man/* & /usr/man/man/*,
 - fixed permission of /var/spool/mail,
 - added /etc/mail && /home/ftp,
 - added /usr/lib/gopher-data && /usr/lib/games.