[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/autofs/devel autofs.spec,1.181,1.182



Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7196

Modified Files:
	autofs.spec 
Log Message:
* Fri Feb 9 2007 Ian Kent <ikent redhat com> - 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.



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- autofs.spec	6 Feb 2007 01:05:55 -0000	1.181
+++ autofs.spec	9 Feb 2007 04:43:16 -0000	1.182
@@ -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 @@
 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 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 @@
 %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 <ikent redhat com> - 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 <ikent redhat com> - 5.0.1-0.rc3.15
 - fix race when setting task done (bz 227268).
 
@@ -853,7 +859,7 @@
   support backwards compat.
 
 * Wed Apr 14 2004  Jeff Moyer <jmoyer redhat com> - 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 @@
   reference an already-freed variable.
 
 * Mon Mar 15 2004 Jeff Moyer <jmoyer redhat com> - 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 <jmoyer redhat com> 1:4.1.0-5
 - make the init script only recognize redhat systems.  Nalin seems to remember


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]