- -server and -client Prereq: /sbin/chkconfig

- run chkconfig --del only on remove, not upgrade; do it in preun, not postun
- added Source URL (note: there is 5.3.15 on ftp - time for upgrade?)
- rest of pl descriptions; removed "BEWARE" - it's not cvs version now?
- fixed init scripts permissions

Changed files:
    coda.spec -> 1.24

diff --git a/coda.spec b/coda.spec
index fd82ba31cee6eb6f069d8bcb5d0b0c8ffc008d2c..b59fd6435d2c4ffc761319be6a1de7a6bdaf2250 100644 (file)
--- a/coda.spec
+++ b/coda.spec
@@ -7,7 +7,7 @@ Copyright:      CMU
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Source0:       %{name}-%{version}.tgz
+Source0:       ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tgz
 Patch0:                %{name}-ugly-common.patch
 Requires:      bc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -16,13 +16,13 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Source package for the Coda filesystem. Three packages are provided by
 this rpm: the client and server and the backup components. Separately
 you must install a kernel module, or have a Coda enabled kernel, and
-you should get the Coda documentation package. BEWARE: CVS VERSION
+you should get the Coda documentation package.
 
 %description -l pl
 Pakiet ¼ród³owy systemu plików Coda. Rpm zawiera trzy pakiety:
 klienta, serwer oraz komponenty do backupu. Nale¿y oddzielnie
 zainstalowaæ modu³ do j±dra (lub mieæ j±dro z obs³ug± Cody), nale¿y
-rownie¿ zaopatrzyæ siê w pakiet z dokumentacj± Cody. UWAGA: WERSJA CVS
+rownie¿ zaopatrzyæ siê w pakiet z dokumentacj± Cody.
 
 %package client
 Summary:       Coda client
@@ -30,6 +30,7 @@ Summary(pl):  Klient Cody
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
+Prereq:                /sbin/chkconfig
 
 %description client
 This package contains the main client program, the cachemanager Venus.
@@ -39,7 +40,14 @@ tools for fixing conflicts. Finally there is the cmon and codacon
 console utilities to monitor Coda's activities. You need a Coda
 kernel-module for your kernel version, or Coda in your kernel, to have
 a complete coda client. Make sure to select the correct C library
-version. BEWARE: CVS VERSION
+version.
+
+%description client -l pl
+Ten pakiet zawiera g³ównego klienta, zarz±dcê cache Venus. Do³±czone s±
+tak¿e binaria cfs, narzêdzia do logowania, zarz±dzania ACL-ami itp.,
+narzêdzia do u¿ywania z laptopami i narzêdzia do naprawiania
+konfliktów. S± tak¿e narzêdzia cmon i codacon do monitorowania
+aktywno¶ci Cody. Pakiet wymaga Cody w kernelu lub module kernela.
 
 %package server
 Summary:       Coda server
@@ -47,18 +55,32 @@ Summary(pl):        Serwer Cody
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
+Prereq:                /sbin/chkconfig
 
 %description server
 This package contains the fileserver codasrv for the coda filesystem,
 as well as the volume utilities. For highest performance you will need
-a modified kernel with inode system calls. BEWARE: CVS VERSION
+a modified kernel with inode system calls.
+
+%description server -l pl
+Ten pakiet zawiera codasrv - serwer systemu plików Coda, oraz narzêdzia
+do wolumenów. Aby osi±gn±æ lepsz± wydajno¶æ, potrzebny jest
+zmodyfikowany kernel z wywo³aniami dotycz±cymi inodów.
 
 %package backup
 Summary:       Coda backup coordinator
 Summary(pl):   Program do zarz±dzania backupem Cody
+Group:         Networking
+Group(de):     Netzwerkwesen
+Group(pl):     Sieciowe
+
 %description backup
 This package contains the backup software for the coda filesystem, as
-well as the volume utilities. BEWARE: CVS VERSION
+well as the volume utilities.
+
+%description backup -l pl
+Ten pakiet zawiera oprogramowanie do backupu systemu plików Coda oraz
+narzêdzia do wolumenów.
 
 %prep
 %setup -q
@@ -75,7 +97,6 @@ CFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
        --prefix=%{_prefix}
 %{__make} OPTFLAGS="%{rpmcflags}"
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_prefix}/coda/venus.cache \
@@ -90,9 +111,6 @@ touch $RPM_BUILD_ROOT%{_prefix}/coda/venus.cache/INIT
 touch $RPM_BUILD_ROOT/coda/NOT_REALLY_CODA
 
 %clean
-Group:         Networking/Daemons
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
 rm -rf $RPM_BUILD_ROOT
 
 %pre client
@@ -104,6 +122,14 @@ else
        exit 0
 fi
 
+%post client
+if [ -e /usr/coda/etc/vstab ]; then 
+       touch /usr/coda/venus.cache/INIT
+else
+       %{_sbindir}/venus-setup testserver.coda.cs.cmu.edu 40000
+fi
+/sbin/chkconfig --add venus.init
+
 %preun client
 grep "^coda" /proc/mounts > /dev/null 2>&1
 if [ $? = 0 ]; then
@@ -112,27 +138,21 @@ if [ $? = 0 ]; then
 else
        exit 0
 fi
-       
-%post client
-if [ -e /usr/coda/etc/vstab ]; then 
-       touch /usr/coda/venus.cache/INIT
-else
-       %{_sbindir}/venus-setup testserver.coda.cs.cmu.edu 40000
+if [ "$1" = "0" ]; then
+       /sbin/chkconfig --del venus.init
 fi
-/sbin/chkconfig --add venus.init
-
-%postun
-/sbin/chkconfig --del venus.init
 
 %post server
 /sbin/chkconfig --add update.init
 /sbin/chkconfig --add auth2.init
 /sbin/chkconfig --add codasrv.init
 
-%postun server
-/sbin/chkconfig --del update.init
-/sbin/chkconfig --del auth2.init
-/sbin/chkconfig --del codasrv.init
+%preun server
+if [ "$1" = "0" ]; then
+       /sbin/chkconfig --del update.init
+       /sbin/chkconfig --del auth2.init
+       /sbin/chkconfig --del codasrv.init
+fi
 
 %files client
 %defattr(644,root,root,755)
@@ -140,7 +160,7 @@ fi
 %dir %{_prefix}/coda%{_sysconfdir}
 %dir %{_prefix}/coda/venus.cache
 %verify() %{_prefix}/coda/venus.cache/INIT
-/etc/rc.d/init.d/venus.init
+%attr(754,root,root) /etc/rc.d/init.d/venus.init
 %dir /coda
 %verify() /coda/NOT_REALLY_CODA
 %attr(755,root,root) %{_sbindir}/venus-setup
@@ -193,9 +213,9 @@ fi
 %attr(755,root,root) %{_bindir}/norton
 %attr(755,root,root) %{_bindir}/norton-reinit
 %attr(755,root,root) %{_bindir}/reinit
-/etc/rc.d/init.d/codasrv.init
-/etc/rc.d/init.d/auth2.init
-/etc/rc.d/init.d/update.init
+%attr(754,root,root) /etc/rc.d/init.d/codasrv.init
+%attr(754,root,root) /etc/rc.d/init.d/auth2.init
+%attr(754,root,root) /etc/rc.d/init.d/update.init
 
 %files backup  
 %defattr(644,root,root,755)