X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=coda.spec;h=e52d86eb4b334562864cd5bdb982c51f5b9d9d74;hb=HEAD;hp=cb7ec0f8a61ad084d5f0254669dc0fd0296cef9c;hpb=e90a38dcbd4cf764e74913e7e55d30e950970aa4;p=packages%2Fcoda.git

diff --git a/coda.spec b/coda.spec
index cb7ec0f..e52d86e 100644
--- a/coda.spec
+++ b/coda.spec
@@ -1,31 +1,38 @@
-#
 # TODO:
-#   - more FHS-compilant changes (/coda, /usr/coda)
-#   - more cleanings initscripts
+#   - FHS (at least /usr/coda, /var/coda - assuming that /coda is special)
 #   - separate some programs to coda-common package
 #
 Summary:	Coda distributed filesystem
-Summary(pl):	Rozproszony system plików Coda
+Summary(pl.UTF-8):	Rozproszony system plików Coda
 Name:		coda
-Version:	5.3.20
-Release:	1
+Version:	6.9.5
+Release:	0.1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
+# Source0-md5:	23e3cbed0eea41aa9a9dea45df31938b
 Source1:	%{name}.venus.init
 Source2:	%{name}.auth2.init
 Source3:	%{name}.codasrv.init
 Source4:	%{name}.update.init
 Patch0:		%{name}-ugly-common.patch
 Patch1:		%{name}-FHS.patch
+Patch3:		%{name}-gcc-334-2.patch
 URL:		http://www.coda.cs.cmu.edu/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	lwp-devel
-BuildRequires:	rvm-devel
-BuildRequires:	rpc2-devel
+BuildRequires:	bison
+BuildRequires:	db-devel
+BuildRequires:	e2fsprogs-devel >= 1.34
+BuildRequires:	flex
+BuildRequires:	libstdc++-devel
+BuildRequires:	lwp-devel >= 2.1
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
+BuildRequires:	rpc2-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rvm-devel
+BuildRequires:	rvm-tools
 Requires:	bc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,17 +42,31 @@ 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.
 
-%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.
+%description -l pl.UTF-8
+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
+również zaopatrzyć się w pakiet z dokumentacją Cody.
+
+%package common
+Summary:	Coda filesystem common programs
+Summary(pl.UTF-8):	Wspólne programy dla klienta i serwera systemu plików Coda
+Group:		Networking/Daemons
+
+%description common
+This package contains programs used by server and client.
+
+%description common -l pl.UTF-8
+Ten pakiet zawiera programy używane przez klienta i serwer systemu
+plików Coda.
 
 %package client
 Summary:	Coda client
-Summary(pl):	Klient Cody
+Summary(pl.UTF-8):	Klient Cody
 Group:		Networking/Daemons
-Prereq:		/sbin/chkconfig
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-scripts
 
 %description client
 This package contains the main client program, the cachemanager Venus.
@@ -57,68 +78,81 @@ 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.
 
-%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.
+%description client -l pl.UTF-8
+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
-Summary(pl):	Serwer Cody
+Summary(pl.UTF-8):	Serwer Cody
 Group:		Networking/Daemons
-Prereq:		/sbin/chkconfig
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-scripts
+Requires:	rvm-tools
 
 %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.
 
-%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.
+%description server -l pl.UTF-8
+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
+Summary(pl.UTF-8):	Program do zarządzania backupem Cody
 Group:		Networking
 
 %description backup
 This package contains the backup software for the coda filesystem, as
 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.
+%description backup -l pl.UTF-8
+Ten pakiet zawiera oprogramowanie do backupu systemu plików Coda oraz
+narzędzia do wolumenów.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
+%patch3 -p1
 
 %build
 touch ChangeLog
-#autoheader
-%{__aclocal}
-#autoconf
-#%%configure
-CFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
-./configure %{_target_platform} \
-	--prefix=%{_prefix}
-%{__make} OPTFLAGS="%{rpmcflags}"
+#%{__autoheader}
+#%{__aclocal}
+cp -f /usr/share/automake/config.sub configs
+%{__autoconf}
+%configure \
+	--enable-crypto
+%{__make} \
+	OPTFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_prefix}/coda/venus.cache \
+install -d $RPM_BUILD_ROOT%{_localstatedir}/%{name}/venus.cache \
 	$RPM_BUILD_ROOT%{_prefix}/coda%{_sysconfdir} \
-	$RPM_BUILD_ROOT/coda $RPM_BUILD_ROOT/etc/rc.d/init.d
+	$RPM_BUILD_ROOT/coda $RPM_BUILD_ROOT/etc/rc.d/init.d \
+	$RPM_BUILD_ROOT/garbage
 
-%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} client-install
-%{__make} prefix=$RPM_BUILD_ROOT%{_prefix} server-install
+%{__make} install \
+	prefix=$RPM_BUILD_ROOT%{_prefix} \
+	exec_prefix=$RPM_BUILD_ROOT%{_prefix} \
+	libdir=$RPM_BUILD_ROOT%{_libdir} \
+	libexecdir=$RPM_BUILD_ROOT%{_libexecdir} \
+	bindir=$RPM_BUILD_ROOT%{_bindir} \
+	sbindir=$RPM_BUILD_ROOT%{_sbindir} \
+	mandir=$RPM_BUILD_ROOT%{_mandir} \
+	sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+	initsuffix=$RPM_BUILD_ROOT/garbage
 
-touch $RPM_BUILD_ROOT%{_prefix}/coda/venus.cache/INIT
+touch $RPM_BUILD_ROOT%{_localstatedir}/%{name}/venus.cache/INIT
 #mknod $RPM_BUILD_ROOT/dev/cfs0 c 67 0
 touch $RPM_BUILD_ROOT/coda/NOT_REALLY_CODA
 
@@ -127,6 +161,10 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auth2
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/codasrv
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/update
 
+%{__perl} -pi -e "s!usr/coda!var/lib/coda!" $RPM_BUILD_ROOT%{_sysconfdir}/coda/*
+
+install -d $RPM_BUILD_ROOT/var/lib/coda/vice/{auth2,db,misc,spool,srv,vol}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,12 +178,13 @@ else
 fi
 
 %post client
-if [ -e /usr/coda/etc/vstab ]; then
-	touch /usr/coda/venus.cache/INIT
+if [ -e %{_sysconfdir}/coda/vstab ]; then
+	touch /var/lib/coda/venus.cache/INIT
 else
 	%{_sbindir}/venus-setup testserver.coda.cs.cmu.edu 40000
 fi
 /sbin/chkconfig --add venus
+%service venus restart
 
 %preun client
 grep "^coda" /proc/mounts > /dev/null 2>&1
@@ -156,42 +195,58 @@ else
 	exit 0
 fi
 if [ "$1" = "0" ]; then
+	%service venus stop
 	/sbin/chkconfig --del venus
 fi
 
 %post server
-/sbin/chkconfig --add update
 /sbin/chkconfig --add auth2
+%service auth2 restart
+
+/sbin/chkconfig --add update
+%service update restart
+
 /sbin/chkconfig --add codasrv
+%service codasrv restart
 
 %preun server
 if [ "$1" = "0" ]; then
+	%service update stop
 	/sbin/chkconfig --del update
+
+	%service auth2 stop
 	/sbin/chkconfig --del auth2
+
+	%service codasrv stop
 	/sbin/chkconfig --del codasrv
 fi
 
+%files common
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/coda
+%attr(755,root,root) %{_sbindir}/codaconfedit
+#%attr(755,root,root) %{_sbindir}/coda-setup-ports
+%attr(755,root,root) %{_bindir}/rpc2ping
+
 %files client
 %defattr(644,root,root,755)
 %dir %{_prefix}/coda
 %dir %{_prefix}/coda%{_sysconfdir}
-%dir %{_prefix}/coda/venus.cache
-%verify() %{_prefix}/coda/venus.cache/INIT
+%dir %{_localstatedir}/%{name}/venus.cache
+%verify() %{_localstatedir}/%{name}/venus.cache/INIT
 %attr(754,root,root) /etc/rc.d/init.d/venus
 %dir /coda
 %verify() /coda/NOT_REALLY_CODA
-%dir %{_sysconfdir}/coda
 %{_sysconfdir}/coda/venus.conf.ex
-%attr(755,root,root) %{_sbindir}/codaconfedit
+#%{_sysconfdir}/coda/sidekick.intr.ex
+%config %{_sysconfdir}/coda/realms
 %attr(755,root,root) %{_sbindir}/codastart
-%attr(755,root,root) %{_sbindir}/coda-setup-ports
-%attr(755,root,root) %{_sbindir}/pwdtopdbtool.py
+#%attr(755,root,root) %{_sbindir}/pwdtopdbtool.py
 %attr(755,root,root) %{_sbindir}/venus-setup
 %attr(755,root,root) %{_sbindir}/vutil
 %attr(755,root,root) %{_sbindir}/venus
-%attr(755,root,root) %{_sbindir}/au
+%attr(755,root,root) %{_bindir}/au
 %attr(755,root,root) %{_bindir}/clog
-%attr(755,root,root) %{_bindir}/codaconfedit
 %attr(755,root,root) %{_bindir}/coda_replay
 %attr(755,root,root) %{_bindir}/cpasswd
 %attr(755,root,root) %{_bindir}/ctokens
@@ -202,24 +257,44 @@ fi
 %attr(755,root,root) %{_bindir}/cfs
 %attr(755,root,root) %{_bindir}/getvolinfo
 %attr(755,root,root) %{_bindir}/hoard
+%attr(755,root,root) %{_bindir}/mkcodabf
+#%attr(755,root,root) %{_bindir}/vcodacon
 %attr(755,root,root) %{_bindir}/spy
 %attr(755,root,root) %{_bindir}/parser
-%attr(755,root,root) %{_bindir}/rpc2ping
+%attr(755,root,root) %{_bindir}/rvmsizer
 %attr(755,root,root) %{_bindir}/smon2
 %attr(755,root,root) %{_bindir}/filerepair
 %attr(755,root,root) %{_bindir}/removeinc
 %attr(755,root,root) %{_bindir}/xfrepair
 %attr(755,root,root) %{_bindir}/xaskuser
+%attr(755,root,root) %{_bindir}/gcodacon
+%{_mandir}/man1/au.1*
+%{_mandir}/man1/cfs.1*
+%{_mandir}/man1/clog.1*
+%{_mandir}/man1/coda_replay.1*
+%{_mandir}/man1/cmon.1*
+%{_mandir}/man1/cpasswd.1*
+%{_mandir}/man1/ctokens.1*
+%{_mandir}/man1/cunlog.1*
+%{_mandir}/man1/hoard.1*
+%{_mandir}/man1/mkcodabf.1*
+%{_mandir}/man1/spy.1*
+%{_mandir}/man1/repair.1*
 %attr(755,root,root) %{_sbindir}/volmunge
+%attr(755,root,root) %{_sbindir}/tokentool
+#%attr(755,root,root) %{_sbindir}/sidekick
+#%attr(755,root,root) %{_sbindir}/coda-client-logrotate
+%attr(755,root,root) %{_bindir}/mklka
 
 %files server
 %defattr(644,root,root,755)
 %{_sysconfdir}/coda/server.conf.ex
+%attr(755,root,root) %{_sbindir}/asrlauncher
+%attr(755,root,root) %{_sbindir}/codadump2tar
 %attr(755,root,root) %{_sbindir}/startserver
 %attr(755,root,root) %{_sbindir}/partial-reinit.sh
 %attr(755,root,root) %{_sbindir}/createvol_rep
 %attr(755,root,root) %{_sbindir}/pdbtool
-%attr(755,root,root) %{_sbindir}/purgevol
 %attr(755,root,root) %{_sbindir}/purgevol_rep
 %attr(755,root,root) %{_sbindir}/bldvldb.sh
 %attr(755,root,root) %{_sbindir}/vice-setup
@@ -231,7 +306,7 @@ fi
 %attr(755,root,root) %{_sbindir}/auth2
 %attr(755,root,root) %{_sbindir}/initpw
 %attr(755,root,root) %{_sbindir}/volutil
-%attr(755,root,root) %{_sbindir}/rpc2portmap
+#%attr(755,root,root) %{_sbindir}/rpc2portmap
 %attr(755,root,root) %{_sbindir}/inoder
 %attr(755,root,root) %{_sbindir}/parserecdump
 %attr(755,root,root) %{_sbindir}/codasrv
@@ -239,12 +314,48 @@ fi
 %attr(755,root,root) %{_sbindir}/updatesrv
 %attr(755,root,root) %{_sbindir}/updateclnt
 %attr(755,root,root) %{_sbindir}/updatefetch
-%attr(755,root,root) %{_bindir}/norton
-%attr(755,root,root) %{_bindir}/norton-reinit
+%attr(755,root,root) %{_sbindir}/coda-server-logrotate
+%attr(755,root,root) %{_sbindir}/norton
+%attr(755,root,root) %{_sbindir}/norton-reinit
 %attr(755,root,root) %{_bindir}/reinit
+%{_mandir}/man5/backuplogs.5*
+%{_mandir}/man5/dumpfile.5*
+%{_mandir}/man5/dumplist.5*
+%{_mandir}/man5/maxgroupid.5*
+%{_mandir}/man5/passwd.coda.5*
+%{_mandir}/man5/servers.5*
+%{_mandir}/man5/vicetab.5*
+%{_mandir}/man5/volumelist.5*
+%{_mandir}/man5/vrdb.5*
+%{_mandir}/man8/auth2.8*
+%{_mandir}/man8/initpw.8*
+%{_mandir}/man8/backup.8*
+%{_mandir}/man8/bldvldb.sh.8*
+%{_mandir}/man8/codasrv.8*
+%{_mandir}/man8/createvol_rep.8*
+%{_mandir}/man8/merge.8*
+%{_mandir}/man8/norton.8*
+%{_mandir}/man8/pdbtool.8*
+%{_mandir}/man8/purgevol_rep.8*
+%{_mandir}/man8/readdump.8*
+%{_mandir}/man8/startserver.8*
+%{_mandir}/man8/updateclnt.8*
+%{_mandir}/man8/updatesrv.8*
+%{_mandir}/man8/venus-setup.8*
+%{_mandir}/man8/venus.8*
+%{_mandir}/man8/vice-setup.8*
+%{_mandir}/man8/volmunge.8*
+%{_mandir}/man8/volutil.8*
+%{_mandir}/man8/vutil.8*
 %attr(754,root,root) /etc/rc.d/init.d/codasrv
 %attr(754,root,root) /etc/rc.d/init.d/auth2
 %attr(754,root,root) /etc/rc.d/init.d/update
+%dir /var/lib/coda/vice
+%dir /var/lib/coda/vice/auth2
+%dir /var/lib/coda/vice/db
+%dir /var/lib/coda/vice/misc
+%dir /var/lib/coda/vice/spool
+%dir /var/lib/coda/vice/srv
 
 %files backup
 %defattr(644,root,root,755)