- updated to 5.1.5

- updated systemd-service patch

diff --git a/autofs-systemd-service.patch b/autofs-systemd-service.patch
index 31fae00fb5185b545b695464193873640a5c8511..dd1f7ad5c0d315dbe5564511bffbbedb26ee7e6a 100644 (file)
--- a/autofs-systemd-service.patch
+++ b/autofs-systemd-service.patch
@@ -1,10 +1,10 @@
---- autofs-5.1.4/samples/autofs.service.in.orig        2018-04-11 05:33:10.457186708 +0200
-+++ autofs-5.1.4/samples/autofs.service.in     2018-04-11 17:15:47.396705425 +0200
+--- autofs-5.1.5/samples/autofs.service.in.orig        2018-11-24 22:55:08.414435285 +0100
++++ autofs-5.1.5/samples/autofs.service.in     2018-11-25 08:34:53.977371427 +0100
 @@ -1,6 +1,6 @@
  [Unit]
  Description=Automounts filesystems on demand
--After=network.target ypbind.service sssd.service network-online.target remote-fs.target
-+After=network.target ypbind.service sssd.service network-online.target remote-fs.target nslcd.service
+-After=network.target ypbind.service sssd.service network-online.target remote-fs.target rpc-statd.service rpcbind.service
++After=network.target ypbind.service sssd.service network-online.target remote-fs.target rpc-statd.service rpcbind.service nslcd.service
  Wants=network-online.target rpc-statd.service rpcbind.service
  
  [Service]

diff --git a/autofs.spec b/autofs.spec
index 6bf7b9f17d579048f1f966e0f80623de77e6416d..83bdfa6c149db5235152b51f30308be3052cef2f 100644 (file)
--- a/autofs.spec
+++ b/autofs.spec
@@ -12,13 +12,13 @@ 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.4
+Version:       5.1.5
 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: 5d35e3282e7a47ec1a5acaeebcc51db2
+# Source0-md5: 61d2cfbf51159c9c82b57e1ea9c34376
 Source1:       %{name}.init
 Source2:       %{name}-auto.master
 Source3:       %{name}-auto.media
@@ -37,11 +37,12 @@ BuildRequires:      flex
 BuildRequires: heimdal-devel
 BuildRequires: hesiod-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
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      mktemp
@@ -135,18 +136,18 @@ export HAVE_SSS_AUTOFS=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}