Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2019-03-20 13:17:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs" Wed Mar 20 13:17:21 2019 rev:119 rq:686173 version:5.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2019-02-04 21:21:14.807656414 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new.28833/autofs.changes 2019-03-20 13:17:24.309369568 +0100 @@ -1,0 +2,7 @@ +Sun Mar 17 14:50:26 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Drop pre-12.2 parts from build recipe +- Switch %systemd_requires to %systemd_ordering, since %service_* + can deal with its absence. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.62CNv2/_old 2019-03-20 13:17:25.153369382 +0100 +++ /var/tmp/diff_new_pack.62CNv2/_new 2019-03-20 13:17:25.157369381 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,12 +21,6 @@ %define _fillupdir /var/adm/fillup-templates %endif -%if 0%{?suse_version} >= 1220 -%define with_systemd 1 -%else -%define with_systemd 0 -%endif - %if 0%{?suse_version} >= 1230 %define with_udisks 1 %else @@ -66,10 +60,7 @@ %if %{with_udisks} BuildRequires: pkgconfig(udisks2) %endif -%if %{with_systemd} -BuildRequires: systemd BuildRequires: systemd-devel -%endif Version: 5.1.5 Release: 0 Summary: A Kernel-Based Automounter @@ -98,11 +89,8 @@ Patch105: autofs-5-1-3-fix-unset-tsd-group-name-handling.patch Requires(pre): %fillup_prereq Requires(pre): aaa_base -%if %{with_systemd} -%{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif +BuildRequires: systemd-rpm-macros +%{?systemd_ordering} Recommends: nfs-client %description @@ -133,9 +121,7 @@ --disable-mount-locking \ --enable-forced-shutdown \ --enable-ignore-busy \ -%if %{with_systemd} --with-systemd \ -%endif --with-libtirpc \ --with-hesiod=no \ --with-sasl @@ -143,17 +129,12 @@ %{?_smp_mflags} %install -make install INSTALLROOT=%{buildroot} -make install_samples INSTALLROOT=%{buildroot} +%make_install INSTALLROOT=%{buildroot} install_samples install -d -m 755 %{buildroot}%{_sysconfdir}/auto.master.d install -D -m 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.autofs install -D -m 755 %{SOURCE7} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/autofs ln -s %{_mandir}/man8/autofs.8.gz %{buildroot}/%{_mandir}/man8/rcautofs.8.gz -%if %{with_systemd} ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcautofs -%else -ln -s ../../etc/init.d/autofs %{buildroot}%{_sbindir}/rcautofs -%endif %if %{with_udisks} install -D -m 644 %{SOURCE42} %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf %endif @@ -161,34 +142,19 @@ rm -f %{buildroot}%{_sysconfdir}/sysconfig/autofs %pre -%if %{with_systemd} %service_add_pre %{name}.service -%endif %post -%if %{with_systemd} %service_add_post %{name}.service -%else -if /sbin/chkconfig -c autofs 3; then - %{insserv_force_if_yast autofs} -fi -%endif %{fillup_only} %preun %{stop_on_removal autofs} -%if %{with_systemd} %service_del_preun %{name}.service -%endif %{fillup_only} %postun -%if %{with_systemd} %service_del_postun %{name}.service -%else -%{restart_on_update autofs} -%{insserv_cleanup} -%endif %files %defattr (-, root, root) @@ -216,10 +182,6 @@ %{_mandir}/man8/* %{_sbindir}/automount %{_sbindir}/rcautofs -%if %{with_systemd} %{_unitdir}/autofs.service -%else -%config %{_sysconfdir}/init.d/autofs -%endif %changelog
