- replace non-existent %chkconfig_{post,preun} macros with

[packages/am-utils.git] / am-utils.spec

diff --git a/am-utils.spec b/am-utils.spec
index ea9f6551a8f661649ae02587c7026b009cbd252b..0a84b0b897010dc02c01f6086f03320156d953c3 100644 (file)
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,17 +1,19 @@
-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.3
 Release:       1
 License:       BSD
 Group:         Daemons
+Group(de):     Server
 Group(pl):     Serwery
 Source0:       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
+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
 Obsoletes:     amd
@@ -38,7 +40,7 @@ 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=%{_sysconfdir} \
@@ -46,22 +48,18 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
        
 # fun with autoconf
 touch `find -name Makefile.in`
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d}
 
-make install prefix=$RPM_BUILD_ROOT%{_prefix} sysconfdir=`pwd`%{_sysconfdir}
+%{__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
 
@@ -75,15 +73,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add amd
-[ -x /usr/sbin/fix-info-dir ] && /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+NAME=amd; %chkconfig_add
+%fix_info_dir
+
+%preun
+NAME=amd; %chkconfig_del
 
 %postun
-[ -x /usr/sbin/fix-info-dir ] && /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)