From d0051c1953f2fa6a66a6a8afed8992dbe6a8d105 Mon Sep 17 00:00:00 2001 From: ikent Date: Feb 09 2007 04:43:16 +0000 Subject: - make use of spaces and tabs in spec file consistent. - escape embedded macro text in %%changelog. - eliminate redundant %%version and %%release. - remove directory component from entries in Requires: and scriplets where possible. - remove redundant conditional check from %%clean. - remove redundant exit from %%preun. - correct %%defattr spec. - remove empty %%doc and redundant %%dir misc lines. - combine program module spec lines into simpler one line form. --- diff --git a/autofs.spec b/autofs.spec index 42cc4fa..d1d8565 100644 --- a/autofs.spec +++ b/autofs.spec @@ -3,10 +3,8 @@ # Summary: A tool for automatically mounting and unmounting filesystems Name: autofs -%define version 5.0.1 -%define release 0.rc3.15 -Version: %{version} -Release: %{release} +Version: 5.0.1 +Release: 0.rc3.17 Epoch: 1 License: GPL Group: System Environment/Daemons @@ -23,11 +21,11 @@ Patch9: autofs-5.0.1-rc3-task-done-race.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 -Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps -Requires(post): /sbin/chkconfig +Requires: bash mktemp sed gawk textutils sh-utils grep /bin/ps +Requires(post): chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service -Requires(postun): /sbin/chkconfig +Requires(postun): chkconfig Obsoletes: autofs-ldap Summary(de): autofs daemon Summary(fr): démon autofs @@ -92,27 +90,25 @@ install -m 755 redhat/autofs.init $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add autofs +chkconfig --add autofs %postun if [ $1 -ge 1 ] ; then - /sbin/service autofs condrestart > /dev/null 2>&1 || : + /sbin/service autofs condrestart > /dev/null 2>&1 || : fi %preun if [ "$1" = 0 ] ; then - /sbin/service autofs stop > /dev/null 2>&1 || : - /sbin/chkconfig --del autofs + /sbin/service autofs stop > /dev/null 2>&1 || : + chkconfig --del autofs fi -exit 0 %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc CREDITS INSTALL COPY* README* patches/* samples/ldap* samples/autofs.schema -%doc %config /etc/rc.d/init.d/autofs %config(noreplace,missingok) /etc/auto.master %config(noreplace,missingok) /etc/auto.misc @@ -120,13 +116,23 @@ exit 0 %config(noreplace,missingok) /etc/auto.smb %config(noreplace) /etc/sysconfig/autofs %config(noreplace) /etc/autofs_ldap_auth.conf -%dir /misc -%dir %{_libdir}/autofs %{_sbindir}/automount %{_mandir}/*/* -%{_libdir}/autofs/* +%{_libdir}/autofs/ %changelog +* Fri Feb 9 2007 Ian Kent - 5.0.1-0.rc3.17 +- make use of spaces and tabs in spec file consistent. +- escape embedded macro text in %%changelog. +- eliminate redundant %%version and %%release. +- remove directory component from entries in Requires: and + scriplets where possible. +- remove redundant conditional check from %%clean. +- remove redundant exit from %%preun. +- correct %%defattr spec. +- remove empty %%doc and redundant %%dir misc lines. +- combine program module spec lines into simpler one line form. + * Tue Feb 6 2007 Ian Kent - 5.0.1-0.rc3.15 - fix race when setting task done (bz 227268). @@ -853,7 +859,7 @@ exit 0 support backwards compat. * Wed Apr 14 2004 Jeff Moyer - 1:4.1.2-1 -- Change hard-coded paths in the spec file to the %{_xxx} variety. +- Change hard-coded paths in the spec file to the %%{_xxx} variety. - Update to upstream 4.1.2. - Add a STRIPDASH option to /etc/sysconfig/autofs which allows for compatibility with the Sun automounter options specification syntax in @@ -897,7 +903,7 @@ exit 0 reference an already-freed variable. * Mon Mar 15 2004 Jeff Moyer - 1:4.1.0-6 -- add %config(noreplace) for auto.* config files. +- add %%config(noreplace) for auto.* config files. * Wed Mar 10 2004 Jeff Moyer 1:4.1.0-5 - make the init script only recognize redhat systems. Nalin seems to remember