- updated to 5.0.8

[packages/autofs.git] / autofs.spec

diff --git a/autofs.spec b/autofs.spec
index 4351a34a6f5412cf1ae8eaa300640e8c3aee5833..51a5c1235fd9ea859b323b07afb8351f2004a851 100644 (file)
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,6 +1,9 @@
 # TODO:
 # - change /net to something FHS-compliant ?
 #
+# Conditional build:
+%bcond_without ldap    # don't build LDAP extension module
+#
 Summary:       autofs daemon
 Summary(de.UTF-8):     autofs daemon
 Summary(es.UTF-8):     Servidor autofs
@@ -9,19 +12,27 @@ 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
-Release:       0.1
+Version:       5.0.8
+Release:       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:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz
+# Source0-md5: 4ed5271598fb1a76475364a4879c7578
 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
+Patch100:      autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch
+Patch101:      autofs-5.0.8-fix-master-map-type-check.patch
+Patch102:      autofs-5.0.8-fix-task-manager-not-getting-signaled.patch
+Patch103:      autofs-5.0.8-allow-with-systemd-to-take-a-path-arg.patch
+Patch104:      autofs-5.0.8-fix-WITH_LIBTIRPC-function-name.patch
+Patch105:      autofs-5.0.8-fix-ipv6-libtirpc-getport.patch
+Patch106:      autofs-5.0.8-fix-allow-with-systemd-to-take-a-path-arg.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bind-devel
@@ -30,13 +41,16 @@ BuildRequires:      e2fsprogs
 BuildRequires: flex
 BuildRequires: heimdal-devel
 BuildRequires: hesiod-devel
+BuildRequires: libtirpc-devel
 BuildRequires: libxml2-devel
 BuildRequires: mount
-BuildRequires: openldap-devel >= 2.4.6
-BuildRequires: rpmbuild(macros) >= 1.268
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
+BuildRequires: rpmbuild(macros) >= 1.647
 Requires(post,preun):  /sbin/chkconfig
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      mktemp
 Requires:      rc-scripts
+Requires:      systemd-units >= 0.38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/autofs
@@ -98,17 +112,28 @@ trzymanych na serwerze LDAP.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
 
 %build
 %{__autoconf}
 
 export initdir=/etc/rc.d/init.d
 %configure \
+       --with-openldap=%{?with_ldap:yes}%{!?with_ldap:no} \
        --enable-force-shutdown=yes \
        --with-confdir=%{_sysconfdir} \
-       --with-mapdir=%{_sysconfdir}
+       --with-mapdir=%{_sysconfdir} \
+       --with-libtirpc \
+       --with-systemd=%{systemdunitdir}
 
-%{__make} \
+%{__make} -j1 \
        initdir=/etc/rc.d/init.d \
        CC="%{__cc}" \
        DAEMON_CFLAGS="-fPIE %{rpmcflags}"
@@ -143,12 +168,20 @@ if [ -f /var/lock/subsys/automount ]; then
        mv /var/lock/subsys/{automount,autofs}
 fi
 %service autofs restart "autofs daemon"
+%systemd_post autofs.service
 
 %preun
 if [ "$1" = "0" ]; then
        %service autofs stop
        /sbin/chkconfig --del autofs
 fi
+%systemd_preun autofs.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- autofs < 5.0.8-1
+%systemd_trigger autofs.service
 
 %files
 %defattr(644,root,root,755)
@@ -164,9 +197,11 @@ fi
 %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) /etc/rc.d/init.d/autofs
+%{systemdunitdir}/autofs.service
 %attr(755,root,root) %{_sbindir}/automount
 %dir /net
 %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
 %attr(755,root,root) %{_libdir}/autofs/lookup_hesiod.so
@@ -183,6 +218,7 @@ fi
 %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_ext4.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
@@ -190,8 +226,10 @@ fi
 %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) %{_sysconfdir}/autofs_ldap_auth.conf
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldap.so
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldaps.so
+%endif