- PLDized

Changed files:
    clusternfs.spec -> 1.2

diff --git a/clusternfs.spec b/clusternfs.spec
index fa9915cc91d187793f763dbb4861e06bcfb9d967..7be83a5940a1a660de44e8c2f220dbe721894bec 100644 (file)
--- a/clusternfs.spec
+++ b/clusternfs.spec
@@ -1,64 +1,67 @@
 Summary:       ClusterNFS server
 Summary(pl):   Serwer ClusterNFS
 Name:          clusternfs
-Version:       3.0.rc2
-Release:       1
+Version:       3.0
+Release:       0.rc2.1
 License:       GPL
 Group:         Networking/Daemons
 URL:           http://clusternfs.sourceforge.net
-Source0:       http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:       clusternfs.init
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}rc2.tar.bz2
+Source1:       %{name}.init
 Requires:      portmap >= 4.0
 Provides:      nfscluster
 Conflicts:     nfs-utils nfs-server
 PreReq:                /sbin/chkconfig
 PreReq:                rc-scripts
-BuildRoot:     %{_tmppath}/%{name}-%{version}
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 ClusterNFS allows diskless clients to share a single root filesystem
-by matching "tagged" filenames of the form "filename$$TAG=value$$" 
+by matching "tagged" filenames of the form "filename$$TAG=value$$"
 with fallback to the original filename.
 
 %description -l pl
-ClusterNFS pozwala bezdyskowym klientom wspó³dzieliæ pojedynczy system 
-plików wybieraj±c odpowiednio "oznakowane" nazwy plików postaci 
+ClusterNFS pozwala bezdyskowym klientom wspó³dzieliæ pojedynczy system
+plików wybieraj±c odpowiednio "oznakowane" nazwy plików postaci
 "plik$$TAG=warto¶æ$$" z podmian± do oryginalnej nazwy.
 
 %prep
-rm -fr %{buildroot}
-%setup -q
+%setup -q -n ClusterNFS
 
 %build
+mv -f aclocal.m4 acinclude.m4
+%{__aclocal}
+%{__autoconf}
 ./BUILD --batch \
        --rquotad=no \
        --ugidd=no --nis=yes \
-       --hosts-access=yes\
-       --libwrap-directory=%{_libdir} \
+       --hosts-access=yes \
+       --libwrap-directory=/usr/lib \
        --exports-uid=0 --exports-gid=0 \
        --log-mounts=yes --multi=yes \
        --devtab=yes --trnames=yes \
-       --path_devtab=%{_localstatedir}/nfs/devtab
+       --path_devtab=/var/lib/clusternfs/devtab
 
-make
+%configure
+
+%{__make}
 
 %install
-rm -fr %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/{var/adm/fillup-templates,etc/rc.d/init.d}
 
-make DESTDIR=%{buildroot} install
-install -d %{buildroot}/var/adm/fillup-templates %{buildroot}/etc/rc.d/init.d
-install -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/clusternfs
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-%post
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/clusternfs
 
+%post
 /sbin/chkconfig --add clusternfs
 if [ -r /var/lock/subsys/clusternfs ]; then
         /etc/rc.d/init.d/clusternfs restart >&2
 else
         echo "Run \"/etc/rc.d/init.d/clusternfs start\" to start nfs daemon."
 fi
-#sed -e 's/NFSDTYPE=.*/NFSDTYPE=K/' /etc/sysconfig/nfsd > /etc/sysconfig/nfsd.new
-#mv -f /etc/sysconfig/nfsd.new /etc/sysconfig/nfsd
 
 %preun
 if [ "$1" = "0" ]; then
@@ -67,17 +70,15 @@ if [ "$1" = "0" ]; then
         fi
         /sbin/chkconfig --del clusternfs
 fi
-                                       
+
 %clean
-rm -fr %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc BUGS COPYING ChangeLog HALL_OF_FAME NEWS README README.HISTORIC TODO README.ClusterNFS EXAMPLE.ClusterNFS
+%defattr(644,root,root,755)
+%doc BUGS ChangeLog* EXAMPLE.ClusterNFS HALL_OF_FAME NEWS README* TODO*
+%attr(754,root,root) /etc/rc.d/init.d/clusternfs
+%attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man5/*
-%{_mandir}/man8/[m-r]*
-%{_localstatedir}/nfs
-%{_sbindir}/rpc.*
-%config(noreplace) %{_initrddir}/clusternfs
-
-%changelog
+%{_mandir}/man8/*
+/var/lib/clusternfs