- patches moved to our cvs

[packages/autofs.git] / autofs.spec

diff --git a/autofs.spec b/autofs.spec
index 200584ed2d188c18334b29b35bc092e68989ad69..79cb2979efaf84a9fadd3407428735779bf1e2d9 100644 (file)
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,3 +1,9 @@
+# TODO:
+# What about unpacked files:
+#  /etc/auto.master
+#  /etc/auto.misc
+#  /etc/auto.net
+# Probably Source{2,3,5} are obsolete.
 Summary:       autofs daemon
 Summary(de):   autofs daemon
 Summary(es):   Servidor autofs
@@ -6,35 +12,32 @@ Summary(pl): Demon autofs
 Summary(pt_BR):        Servidor autofs
 Summary(tr):   autofs sunucu süreci
 Name:          autofs
-Version:       4.0.0pre10
-Release:       6
+Version:       4.1.4
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         Daemons
-Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/testing-v4/%{name}-%{version}.tar.bz2
-# Source0-md5: 45df38e9458bde07315a1bfce099b84a
+Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}.tar.bz2
+# Source0-md5: 7e3949114c00665b4636f0c318179657
 Source1:       %{name}.init
 Source2:       %{name}-auto.master
 Source3:       %{name}-auto.misc
 Source4:       %{name}-auto.mnt
 Source5:       %{name}-auto.net
 Source6:       %{name}.sysconfig
-Patch0:                %{name}-clean.patch
-Patch1:                %{name}-doc.patch
-Patch2:                %{name}-hesiod-bind.patch
-# Needed to check !!
-Patch3:                %{name}-initialize.patch
-Patch4:                %{name}-man.patch
-Patch5:                %{name}-linux-2.3.patch
-Patch6:                %{name}-loop.patch
-Patch7:                %{name}-modules.patch
-Patch8:                %{name}-open_max.patch
+Patch0:                %{name}-open_max.patch
+Patch1:                %{name}-hesiod-includes.patch
+Patch2:                %{name}-4.1.4-misc-fixes.patch
+Patch3:                %{name}-4.1.4-multi-parse-fix.patch   
+Patch4:                %{name}-4.1.4-no-unlink-upstream.patch
+Patch5:                %{name}-4.1.4-non-replicated-ping.patch 
 BuildRequires: automake
 BuildRequires: autoconf
-BuildRequires: openldap-devel
+BuildRequires: bind-devel
+BuildRequires: openldap-devel >= 2.3.0
+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig
 Requires:      mktemp
-Prereq:                rc-scripts
-Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/autofs
@@ -51,7 +54,7 @@ Dies kann Netz-Dateisysteme, CD-ROMs, Disketten und 
 einschließen.
 
 %description -l es
-autofs es un servidor que monta automáticamente sistemas de archivos
+Autofs es un servidor que monta automáticamente sistemas de archivos
 cuando los usa, y los desmonta, más tarde, al terminar de usarlos.
 Incluyendo sistemas de archivo en red, CD-ROMS, disquetes, etc.
 
@@ -79,11 +82,10 @@ a
 
 %package ldap
 Summary:       LDAP lookup module for autofs
-Summary(es):   LDAP map support for the autofs package
 Summary(pl):   Modu³ LDAP dla autofs
 Summary(pt_BR):        Suporte a mapas LDAP para o pacote autofs
 Group:         Daemons
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description ldap
 This package contains the autofs module necessary to use automount
@@ -98,12 +100,9 @@ trzymanych na serwerze LDAP.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch5 -p1
 
 %build
 chmod a+w configure
@@ -115,7 +114,7 @@ chmod a+w configure
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{misc,net,%{_sbindir},%{_libdir}/autofs,%{_mandir}/man{5,8}} \
+install -d $RPM_BUILD_ROOT{/misc,/net,%{_sbindir},%{_libdir}/autofs,%{_mandir}/man{5,8}} \
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,autofs,sysconfig}
 
 %{__make} install \
@@ -128,6 +127,7 @@ install %{SOURCE3}  $RPM_BUILD_ROOT%{_sysconfdir}/auto.misc
 install %{SOURCE4}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.mnt
 install %{SOURCE5}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.net
 install %{SOURCE6}     $RPM_BUILD_ROOT/etc/sysconfig/autofs
+mv $RPM_BUILD_ROOT/etc/auto.smb $RPM_BUILD_ROOT%{_sysconfdir}
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/auto.{home,misc,var,tmp}
 
@@ -156,18 +156,19 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README
+%doc README* CHANGELOG
 
 %attr(754,root,root) %config /etc/rc.d/init.d/autofs
 %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/autofs
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.home
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.master
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.misc
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.mnt
-%attr(750,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.net
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.tmp
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/auto.var
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/autofs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.home
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.master
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.misc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.mnt
+%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.net
+%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.smb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.tmp
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.var
 %attr(755,root,root) %{_sbindir}/automount
 
 %dir /misc
@@ -176,7 +177,7 @@ fi
 %dir %{_libdir}/autofs
 %attr(755,root,root) %{_libdir}/autofs/mount_*
 %attr(755,root,root) %{_libdir}/autofs/parse_*
-%attr(755,root,root) %{_libdir}/autofs/lookup_[^l]*
+%attr(755,root,root) %{_libdir}/autofs/lookup_[!l]*
 
 %{_mandir}/man[58]/*