X-Git-Url: https://git.pld-linux.org/?p=packages%2Fautofs.git;a=blobdiff_plain;f=autofs.spec;h=7d6186e658a763b5ca606fcba33fac3730c2503c;hp=0294e9bdde8b8e8280316551b3baa5af36018d91;hb=HEAD;hpb=d5d00813d6fd24637ace375d05405ee435088ce8

diff --git a/autofs.spec b/autofs.spec
index 0294e9b..7d6186e 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -2,7 +2,8 @@
 # - change /net to something FHS-compliant ?
 #
 # Conditional build:
-%bcond_without	ldap	# don't build LDAP extension module
+%bcond_without	hesiod	# Hesiod support
+%bcond_without	ldap	# LDAP extension module
 #
 Summary:	autofs daemon
 Summary(de.UTF-8):	autofs daemon
@@ -12,21 +13,20 @@ 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.1.6
-Release:	2
+Version:	5.1.9
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
 Source0:	https://www.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz
-# Source0-md5:	b27ee7a1674ae1779aaf75c5e90b0f1e
+# Source0-md5:	06fb59a03c82364a0d788435b6853d70
 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}-makefile.patch
-Patch2:		%{name}-systemd-service.patch
+Patch0:		%{name}-systemd-service.patch
+URL:		https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bison
@@ -34,7 +34,7 @@ BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	e2fsprogs
 BuildRequires:	flex
 BuildRequires:	heimdal-devel
-BuildRequires:	hesiod-devel
+%{?with_hesiod:BuildRequires:	hesiod-devel}
 BuildRequires:	libnsl-devel
 BuildRequires:	libtirpc-devel
 BuildRequires:	libxml2-devel >= 2
@@ -43,6 +43,8 @@ BuildRequires:	mount
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.647
 BuildRequires:	systemd-devel >= 1:209
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	mktemp
@@ -109,8 +111,6 @@ przechowywanych na serwerze LDAP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__autoconf}
@@ -124,15 +124,18 @@ export HAVE_SSS_AUTOFS=1
 %configure \
 	--enable-force-shutdown \
 	--with-confdir=%{_sysconfdir} \
+	%{!?with_hesiod:--without-hesiod} \
 	--with-libtirpc \
 	--with-mapdir=%{_sysconfdir} \
 	--with-openldap%{!?with_ldap:=no} \
 	--with-systemd=%{systemdunitdir}
 
+CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} -j1 \
 	initdir=/etc/rc.d/init.d \
 	CC="%{__cc}" \
-	DAEMON_CFLAGS="-fPIE %{rpmcflags}"
+	DONTSTRIP=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -161,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add autofs
 # triggerpostun would get called after %%post
 if [ -f /var/lock/subsys/automount ]; then
-	mv /var/lock/subsys/{automount,autofs}
+	mv -f /var/lock/subsys/{automount,autofs}
 fi
 %service autofs restart "autofs daemon"
 %systemd_post autofs.service
@@ -197,11 +200,14 @@ fi
 %{systemdunitdir}/autofs.service
 %attr(755,root,root) %{_sbindir}/automount
 %dir /net
+%attr(755,root,root) %{_libdir}/libautofs.so
 %dir %{_libdir}/autofs
 %attr(755,root,root) %{_libdir}/autofs/lookup_dir.so
 %attr(755,root,root) %{_libdir}/autofs/lookup_file.so
 %attr(755,root,root) %{_libdir}/autofs/lookup_files.so
+%if %{with hesiod}
 %attr(755,root,root) %{_libdir}/autofs/lookup_hesiod.so
+%endif
 %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
@@ -221,7 +227,9 @@ fi
 %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_amd.so
+%if %{with hesiod}
 %attr(755,root,root) %{_libdir}/autofs/parse_hesiod.so
+%endif
 %attr(755,root,root) %{_libdir}/autofs/parse_sun.so
 %{_mandir}/man5/auto.master.5*
 %{_mandir}/man5/autofs.5*