X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=autofs.spec;h=034aca0ff8ca38b58a9ff964d0fa22e8cbf9b683;hb=7ad3f8537ec77e388f2f8ff1e784a29c40165d09;hp=4d05edb95fe71f9994497ec760d97bf0c313b20f;hpb=89e06d6691429397bc94fae79d86135629b21216;p=packages%2Fautofs.git

diff --git a/autofs.spec b/autofs.spec
index 4d05edb..034aca0 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,6 +1,8 @@
 # TODO:
 # - change /net to something FHS-compliant ?
-# - fix ac/am regeneration
+#
+# Conditional build:
+%bcond_with	ldap	# build LDAP extension module (need port to heimdal)
 #
 Summary:	autofs daemon
 Summary(de.UTF-8):	autofs daemon
@@ -10,28 +12,30 @@ Summary(pl.UTF-8):	Demon autofs
 Summary(pt_BR.UTF-8):	Servidor autofs
 Summary(tr.UTF-8):	autofs sunucu süreci
 Name:		autofs
-Version:	5.0.4
+Version:	5.0.5
 Release:	0.1
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
 Source0:	ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2
-# Source0-md5:	2646dde61edd08dd952255558c733c08
+# Source0-md5:	a1d262cb6ebef0c2dd0fe22232fb3d5a
 Source1:	%{name}.init
 Source2:	%{name}-auto.master
 Source3:	%{name}-auto.media
 Source4:	%{name}-auto.net
 Source5:	%{name}.sysconfig
 Patch0:		%{name}-open_max.patch
-Patch1:		%{name}-hesiod-includes.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bind-devel
 BuildRequires:	bison
+BuildRequires:	e2fsprogs
 BuildRequires:	flex
-BuildRequires:	krb5-devel
+BuildRequires:	heimdal-devel
+BuildRequires:	hesiod-devel
 BuildRequires:	libxml2-devel
-BuildRequires:	openldap-devel >= 2.4.6
+BuildRequires:	mount
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	mktemp
@@ -97,16 +101,18 @@ trzymanych na serwerze LDAP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-#%{__aclocal}
-#%{__autoconf}
+%{__autoconf}
+
 export initdir=/etc/rc.d/init.d
 %configure \
-	--with-confdir=%{_sysconfdir}
+	--with-openldap=%{?with_ldap:yes}%{!?with_ldap:no} \
+	--enable-force-shutdown=yes \
+	--with-confdir=%{_sysconfdir} \
+	--with-mapdir=%{_sysconfdir}
 
-%{__make} \
+%{__make} -j1 \
 	initdir=/etc/rc.d/init.d \
 	CC="%{__cc}" \
 	DAEMON_CFLAGS="-fPIE %{rpmcflags}"
@@ -125,12 +131,11 @@ install %{SOURCE2}	$RPM_BUILD_ROOT%{_sysconfdir}/auto.master
 install %{SOURCE3}	$RPM_BUILD_ROOT%{_sysconfdir}/auto.media
 install %{SOURCE4} 	$RPM_BUILD_ROOT%{_sysconfdir}/auto.net
 install %{SOURCE5} 	$RPM_BUILD_ROOT/etc/sysconfig/autofs
-mv $RPM_BUILD_ROOT/etc/auto.smb $RPM_BUILD_ROOT%{_sysconfdir}
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/auto.{home,var,tmp}
 
-# Do some cleanups:
-rm -f $RPM_BUILD_ROOT/etc/auto.{master,misc,net}
+# replaced in PLD by auto.media
+rm $RPM_BUILD_ROOT%{_sysconfdir}/auto.misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,6 +159,7 @@ fi
 %doc CHANGELOG CREDITS README*
 %dir %{_sysconfdir}
 %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}/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.media
@@ -161,17 +167,37 @@ fi
 %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(754,root,root) %config /etc/rc.d/init.d/autofs
+%attr(754,root,root) /etc/rc.d/init.d/autofs
 %attr(755,root,root) %{_sbindir}/automount
 %dir /net
 %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_file.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_files.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_hesiod.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_hosts.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_multi.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_nis.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_nisplus.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_program.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_userhome.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_yp.so
+%attr(755,root,root) %{_libdir}/autofs/mount_afs.so
+%attr(755,root,root) %{_libdir}/autofs/mount_autofs.so
+%attr(755,root,root) %{_libdir}/autofs/mount_bind.so
+%attr(755,root,root) %{_libdir}/autofs/mount_changer.so
+%attr(755,root,root) %{_libdir}/autofs/mount_ext2.so
+%attr(755,root,root) %{_libdir}/autofs/mount_ext3.so
+%attr(755,root,root) %{_libdir}/autofs/mount_generic.so
+%attr(755,root,root) %{_libdir}/autofs/mount_nfs.so
+%attr(755,root,root) %{_libdir}/autofs/mount_nfs4.so
+%attr(755,root,root) %{_libdir}/autofs/parse_hesiod.so
+%attr(755,root,root) %{_libdir}/autofs/parse_sun.so
 %{_mandir}/man[58]/*
 
+%if %{with ldap}
 %files ldap
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/autofs_ldap_auth.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/autofs_ldap_auth.conf
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldap.so
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldaps.so
+%endif