- updated to 5.1.9

[packages/autofs.git] / autofs.spec

diff --git a/autofs.spec b/autofs.spec
index 7db62ce74f02c0acf1feb11a09b00baac5515d43..7d6186e658a763b5ca606fcba33fac3730c2503c 100644 (file)
--- 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,22 +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.2
-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: 130dadb63efd5cc585d19c9bf7f00268
+# 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
-URL:           http://www.autofs.org/
+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
@@ -35,12 +34,17 @@ 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
+BuildRequires: libxml2-devel >= 2
 BuildRequires: mount
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
+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
@@ -107,8 +111,6 @@ przechowywanych na serwerze LDAP.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__autoconf}
@@ -122,30 +124,33 @@ 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
-install -d $RPM_BUILD_ROOT{/misc,/net,%{_sbindir},%{_libdir}/autofs,%{_mandir}/man{5,8}} \
-       $RPM_BUILD_ROOT/etc/{rc.d/init.d,autofs,sysconfig}
+install -d $RPM_BUILD_ROOT{/misc,/net,%{_sysconfdir},%{_sbindir},%{_libdir}/autofs,%{_mandir}/man{5,8}} \
+       $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
-%{__make} install \
+%{__make} install install_samples \
        INSTALLROOT=$RPM_BUILD_ROOT
 
 install %{SOURCE1}     $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs
 
-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
+cp -p %{SOURCE2}       $RPM_BUILD_ROOT%{_sysconfdir}/auto.master
+cp -p %{SOURCE3}       $RPM_BUILD_ROOT%{_sysconfdir}/auto.media
+cp -p %{SOURCE4}       $RPM_BUILD_ROOT%{_sysconfdir}/auto.net
+cp -p %{SOURCE5}       $RPM_BUILD_ROOT/etc/sysconfig/autofs
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/auto.{home,var,tmp}
 
@@ -159,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
@@ -195,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
@@ -219,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*