X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=am-utils.spec;h=0a84b0b897010dc02c01f6086f03320156d953c3;hb=a1883ce085376ccc6a5d61e2b72a182345a2894e;hp=ed592283dd46b503e625c4568818b2d0eb92af51;hpb=78cb0ad4f07a86725752621671bb6ae65392b605;p=packages%2Fam-utils.git

diff --git a/am-utils.spec b/am-utils.spec
index ed59228..0a84b0b 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,30 +1,31 @@
-Summary:	Automount utilities including an updated version of Amd.
+Summary:	Automount utilities including an updated version of Amd
+Summary(pl):	Narzêdzia do automatycznego montowania systemów plików
 Name:		am-utils
-Version:	6.0
-Release:	5
-Copyright:	BSD
+Version:	6.0.3
+Release:	1
+License:	BSD
 Group:		Daemons
+Group(de):	Server
 Group(pl):	Serwery
-Source:		ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/%{name}-%{version}.tar.gz
-Source1:	am-utils.init
-Source2:	am-utils.conf
-Source3:	am-utils.sysconf
-Patch0:		am-utils-6.0a16-linux.patch
-Patch1:		am-utils-6.0a16-alpha.patch
-Patch2:		am-utils-6.0a16-glibc21.patch
+Source0:	ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/%{name}-%{version}.tar.gz
+Source1:	%{name}.init
+Source2:	%{name}.conf
+Source3:	%{name}.sysconf
+Patch0:		%{name}-6.0a16-linux.patch
+Patch1:		%{name}-6.0a16-alpha.patch
+Patch2:		%{name}-6.0a16-glibc21.patch
 Requires:	portmap
 Prereq:		/sbin/chkconfig
-Prereq:	        /usr/sbin/fix-info-dir
 Obsoletes:	amd
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Am-utils includes an updated version of Amd, the popular BSD
-automounter.  An automounter is a program which maintains a cache of
-mounted filesystems.  Filesystems are mounted when they are first
-referenced by the user and unmounted after a certain period of inactivity.
-Amd supports a variety of filesystems, including NFS, UFS, CD-ROMS and
-local drives.  
+automounter. An automounter is a program which maintains a cache of
+mounted filesystems. Filesystems are mounted when they are first
+referenced by the user and unmounted after a certain period of
+inactivity. Amd supports a variety of filesystems, including NFS, UFS,
+CD-ROMS and local drives.
 
 You should install am-utils if you need a program for automatically
 mounting and unmounting filesystems.
@@ -39,35 +40,31 @@ mounting and unmounting filesystems.
 
 %build
 cd aux ; autoconf ; mv -f configure .. ; cd ..
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
+CFLAGS="%{rpmcflags}" ./configure \
 	--prefix=%{_prefix} \
 	--enable-shared \
-	--sysconfdir=/etc \
+	--sysconfdir=%{_sysconfdir} \
 	--enable-libs=-lnsl
 	
 # fun with autoconf
 touch `find -name Makefile.in`
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d}
 
-make install prefix=$RPM_BUILD_ROOT%{_prefix} sysconfdir=`pwd`/etc
-install $RPM_SOURCE_DIR/am-utils.conf $RPM_BUILD_ROOT/etc/amd.conf
+%{__make} install prefix=$RPM_BUILD_ROOT%{_prefix} sysconfdir=`pwd`%{_sysconfdir}
+install $RPM_SOURCE_DIR/am-utils.conf $RPM_BUILD_ROOT%{_sysconfdir}/amd.conf
 install $RPM_SOURCE_DIR/am-utils.sysconf $RPM_BUILD_ROOT/etc/sysconfig/amd
 install $RPM_SOURCE_DIR/am-utils.init $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
 
-strip $RPM_BUILD_ROOT%{_sbindir}/* $RPM_BUILD_ROOT%{_bindir}/*
-
-gzip -9nf AUTHORS TODO BUGS NEWS README* ChangeLog \
-	$RPM_BUILD_ROOT%{_mandir}/*
-	$RPM_BUILD_ROOT%{_infodir}/*
+gzip -9nf AUTHORS TODO BUGS NEWS README* ChangeLog
 
 install -d $RPM_BUILD_ROOT/.automount
 
 # get rid of some lame scripts
-file $RPM_BUILD_ROOT/usr/sbin/* | \
+file $RPM_BUILD_ROOT%{_sbindir}/* | \
 	grep -v ELF | grep -v am-eject | \
 	cut -f 1 -d':' | xargs rm -f
 
@@ -76,21 +73,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add amd
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+NAME=amd; %chkconfig_add
+%fix_info_dir
+
+%preun
+NAME=amd; %chkconfig_del
 
 %postun
-/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%fix_info_dir
 /sbin/ldconfig
-if [ $1 = 0 ]; then
-    /sbin/chkconfig --del amd
-fi
 
 %files
 %defattr(644,root,root,755)
 %doc doc/*.ps {AUTHORS,BUGS,ChangeLog,NEWS,README*,TODO}.gz
 %dir /.automount
-%config /etc/amd.conf
+%config %{_sysconfdir}/amd.conf
 %config /etc/sysconfig/amd
 %attr(754,root,root) /etc/rc.d/init.d/amd
 %attr(755,root,root) %{_bindir}/pawd