Hello community,
here is the log from the commit of package smartmontools for openSUSE:Factory
checked in at 2014-10-08 22:13:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smartmontools (Old)
and /work/SRC/openSUSE:Factory/.smartmontools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smartmontools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes
2014-09-09 18:59:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.smartmontools.new/smartmontools.changes
2014-10-08 22:13:31.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Oct 7 22:55:04 CEST 2014 - sbra...@suse.cz
+
+- Re-add /usr/sbin/rcsmards symlink (bnc#900099).
+- Fix service restart in smartmontools.generate_smartd_opts.in
+ (bnc#900099).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.kXOXfK/_old 2014-10-08 22:13:33.000000000 +0200
+++ /var/tmp/diff_new_pack.kXOXfK/_new 2014-10-08 22:13:33.000000000 +0200
@@ -120,7 +120,8 @@
--enable-savestates\
--enable-attributelog
make %{?_smp_mflags} BUILD_INFO='"(SUSE RPM)"'
-sed "s:@libdir@:%{_libdir}:g;s:@localstatedir@:%{_localstatedir}:g"
<smartmontools.generate_smartd_opts.in >generate_smartd_opts
+SERVICE=/usr/sbin/service
+sed
"s:@prefix@:%{_prefix}:g;s:@localstatedir@:%{_localstatedir}:g;s:@SERVICE@:$SERVICE:"
<smartmontools.generate_smartd_opts.in >generate_smartd_opts
%install
%makeinstall
@@ -143,6 +144,9 @@
EOF
%if 0%{?suse_version} >= 1130
cp smartd.service %{buildroot}/%{_unitdir}
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsmartd
+%else
+ln -sf ../../etc/init.d/smartd %{buildroot}%{_sbindir}/rcsmartd
%endif
# INSTALL file is intended only for packagers.
rm %{buildroot}%{_defaultdocdir}/%{name}/INSTALL
@@ -182,7 +186,7 @@
%endif
%if 0%{?suse_version} > 1140
-# Then generate initial %{_localstatedir}/lib/smartmontools/smartd_opts needed
by smartd.service.
+# Then generate initial %%{_localstatedir}/lib/smartmontools/smartd_opts
needed by smartd.service.
SMARTD_SKIP_INIT=1 %{_prefix}/lib/smartmontools/generate_smartd_opts
%endif
# No start by default here.. belongs to -presets packages
++++++ smartmontools.generate_smartd_opts.in ++++++
--- /var/tmp/diff_new_pack.kXOXfK/_old 2014-10-08 22:13:33.000000000 +0200
+++ /var/tmp/diff_new_pack.kXOXfK/_new 2014-10-08 22:13:33.000000000 +0200
@@ -37,11 +37,11 @@
mkdir -p @localstatedir@/lib/smartmontools
-echo "# Generated by @libdir@/smartmontools/generate_smartd_opts
+echo "# Generated by @prefix@/lib/smartmontools/generate_smartd_opts
smartd_opts=\"$smartd_opts\"" >@localstatedir@/lib/smartmontools/smartd_opts
# SMARTD_SKIP_INIT is used during installation.
if test -z "$SMARTD_SKIP_INIT" ; then
# Behavior of both "Command" and "ServiceRestart" is undefined. Restart
service here.
- /etc/init.d/smartd try-restart
+ @SERVICE@ smartd try-restart
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
