rpms/am-utils/devel am-utils.spec,1.43,1.44
Karel Zak (kzak)
fedora-extras-commits at redhat.com
Tue May 20 13:25:23 UTC 2008
Author: kzak
Update of /cvs/pkgs/rpms/am-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870
Modified Files:
am-utils.spec
Log Message:
* Tue May 20 2008 Karel Zak <kzak at redhat.com> 5:6.1.5-9
- spec file cleanup according to rpmlint
Index: am-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- am-utils.spec 19 Feb 2008 10:32:26 -0000 1.43
+++ am-utils.spec 20 May 2008 13:24:33 -0000 1.44
@@ -1,7 +1,7 @@
-Summary: Automount utilities including an updated version of Amd.
+Summary: Automount utilities including an updated version of Amd
Name: am-utils
Version: 6.1.5
-Release: 8%{?dist}
+Release: 9%{?dist}
License: BSD
Epoch: 5
Group: System Environment/Daemons
@@ -36,8 +36,6 @@
Requires(preun): /sbin/install-info
Requires(preun): /sbin/chkconfig
-Obsoletes: amd
-
# 203193 - tmpfile usage
Patch1: am-utils-6.1.5-rmtab-temp.patch
# 202180 - amd service doesn't work
@@ -51,11 +49,11 @@
%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.
@@ -74,55 +72,60 @@
%build
./bootstrap
%configure \
- --enable-shared \
- --enable-am-cflags="$RPM_OPT_FLAGS -DHAVE_LINUX_NFS_MOUNT_H" \
- --enable-libs="-lnsl -lresolv"
+ --enable-shared \
+ --enable-am-cflags="${RPM_OPT_FLAGS} -DHAVE_LINUX_NFS_MOUNT_H" \
+ --enable-libs="-lnsl -lresolv"
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
make %{?_smp_flags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
%makeinstall
-mkdir -p $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
-install -m 644 $RPM_SOURCE_DIR/am-utils.sysconf $RPM_BUILD_ROOT/etc/sysconfig/amd
-#install -m 755 scripts/redhat-ctl-amd $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
-install -m 755 $RPM_SOURCE_DIR/am-utils.init $RPM_BUILD_ROOT/etc/rc.d/init.d/amd
-gzip -q9f $RPM_BUILD_ROOT/%{_infodir}/*info*
-mkdir -p $RPM_BUILD_ROOT/.automount
-rm -f $RPM_BUILD_ROOT/usr/sbin/ctl-amd
+
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/{rc.d/init.d,sysconfig}
+
+install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/rc.d/init.d/amd
+install -m 600 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/amd.conf
+install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/amd
+install -m 640 %{SOURCE4} ${RPM_BUILD_ROOT}/%{_sysconfdir}/amd.net
+
+gzip -q9f ${RPM_BUILD_ROOT}/%{_infodir}/*info*
+mkdir -p ${RPM_BUILD_ROOT}/.automount
+
+rm -f ${RPM_BUILD_ROOT}/usr/sbin/ctl-amd
# add symlinks to shared libs
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
+/sbin/ldconfig -n ${RPM_BUILD_ROOT}/%{_libdir}
+
+# deprecated files
+for I in %{_libdir}/libamu.a \
+ %{_libdir}/libamu.la \
+ %{_libdir}/libamu.so \
+ %{_infodir}/dir \
+ %{_sysconfdir}/amd.conf-sample \
+ %{_sysconfdir}/lostaltmail.conf-sample; do
-# install the default config and map files
-install -m 600 %{SOURCE2} $RPM_BUILD_ROOT/etc/amd.conf
-install -m 640 %{SOURCE4} $RPM_BUILD_ROOT/etc/amd.net
-
-# We don't build a -devel package.
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libamu.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libamu.la
-
-# We don't include the info directory.
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
-# Remove the other sample config file.
-rm -f $RPM_BUILD_ROOT/etc/amd.conf-sample
-rm -f $RPM_BUILD_ROOT/etc/lostaltmail.conf-sample
+ rm -f $RPM_BUILD_ROOT$I
+done
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
%pre
# Check if we have an old fashioned amd.conf and rename if to amd.net
-if test "$1" -ne 0
-then if test -r /etc/amd.conf
- then if grep -v -q "auto_dir" /etc/amd.conf
- then if test ! -e /etc/amd.net
- then mv -f /etc/amd.conf /etc/amd.net
- fi
- fi
- fi
+if test "$1" -ne 0; then
+ if test -r /etc/amd.conf; then
+ if grep -v -q "auto_dir" /etc/amd.conf; then
+ if test ! -e /etc/amd.net; then
+ mv -f /etc/amd.conf /etc/amd.net
+ fi
+ fi
+ fi
fi
%post
@@ -135,7 +138,7 @@
%preun
if [ $1 -eq 0 ]; then
if [ -f %{_infodir}/am-utils.info.gz ]; then
- /sbin/install-info --delete %{_infodir}/am-utils.info.gz %{_infodir}/dir || :
+ /sbin/install-info --delete %{_infodir}/am-utils.info.gz %{_infodir}/dir || :
fi
/sbin/service amd stop >/dev/null 2>&1
/sbin/chkconfig --del amd
@@ -157,14 +160,17 @@
%{_mandir}/man[58]/*
%{_mandir}/man1/expn.1*
%{_mandir}/man1/pawd.1*
-%config(noreplace) /etc/amd.net
-%config(noreplace) /etc/amd.conf
-%config(noreplace) /etc/sysconfig/amd
-%config /etc/rc.d/init.d/amd
+%config(noreplace) %{_sysconfdir}/amd.net
+%config(noreplace) %{_sysconfdir}/amd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/amd
+%{_sysconfdir}/rc.d/init.d/amd
%{_infodir}/*info*.gz
%{_libdir}/libamu.so*
%changelog
+* Tue May 20 2008 Karel Zak <kzak at redhat.com> 5:6.1.5-9
+- spec file cleanup according to rpmlint
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5:6.1.5-8
- Autorebuild for GCC 4.3
@@ -191,11 +197,11 @@
- Add missing br flex
* Thu Jun 01 2006 Peter Vrabec <pvrabec at redhat.com> 5:6.1.5-2
-- force to use HAVE_LINUX_NFS_MOUNT_H macro, because linux/nfs_mount.h
+- force to use HAVE_LINUX_NFS_MOUNT_H macro, because linux/nfs_mount.h
check in configure fails on s390x
* Mon May 29 2006 Peter Vrabec <pvrabec at redhat.com> 5:6.1.5-1
-- upgrade
+- upgrade
- add build depency
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.3-1.2.1
@@ -212,8 +218,8 @@
* Wed Oct 04 2005 Peter Vrabec <pvrabec at redhat.com> 6.1.2.1-1
- upgrade
-- fix amd shutdown(#158268,#54246)
-- enhancement, /host/localhost and /host/<localmachinename>
+- fix amd shutdown(#158268,#54246)
+- enhancement, /host/localhost and /host/<localmachinename>
are symlinks to / (#11843)
* Thu Aug 25 2005 Peter Vrabec <pvrabec at redhat.com> 6.1.1-2
@@ -229,15 +235,15 @@
- fix the am-utils part of #143118 by implementing the util-linux
mtab locking scheme into am-utils automounter, patch and testing
by Daniel Berrange <berrange at redhat.com>, improved locking
- algorithm by <prockai at redhat.com> (which allows for several
- hundred or even thousand of parallel makes to finish
+ algorithm by <prockai at redhat.com> (which allows for several
+ hundred or even thousand of parallel makes to finish
successfully and keep /etc/mtab in sync with /proc/mounts as well)
-
+
* Thu Mar 17 2005 Peter Vrabec <pvrabec at redhat.com>
- rebuild by gcc4
* Tue Oct 12 2004 Adrian Havill <havill at redhat.com> 6.0.9-10
-- cleanup %pre script so amd.conf won't get stat()ed if it doesn't
+- cleanup %%pre script so amd.conf won't get stat()ed if it doesn't
exist (#126656)
* Wed Sep 1 2004 Nalin Dahyabhai <nalin at redhat.com> 6.0.9-9
@@ -408,7 +414,7 @@
- add amd.net file as the default config map file
- change the config file to teh new config file format instead of a
simple map file name.
-- try to avoid some damage with a new %pre script
+- try to avoid some damage with a new %%pre script
- prereq grep now
- modify the init file so it calls amd -F /etc/amd.conf now
@@ -419,7 +425,7 @@
- don't run by default
* Mon May 31 1999 Kenneth Skaar <kenneths at regina.uio.no>
-- Fixed amd -F core dump and related dumps by other programs
+- Fixed amd -F core dump and related dumps by other programs
* Thu Apr 08 1999 Preston Brown <pbrown at redhat.com>
- kill -HUP on reload, restart does a real restart.
@@ -431,7 +437,7 @@
- version 6.0 proper
- Serial:1 because to enforce versioning
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 6)
* Wed Jan 06 1999 Cristian Gafton <gafton at redhat.com>
More information about the scm-commits
mailing list