Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at 2014-09-09 18:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-05 10:49:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smartmontools.new/smartmontools.changes 2014-09-09 18:59:50.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Sep 3 13:27:11 CEST 2014 - r...@suse.de + +- re-add sysvinit support in specfile (fix build on sles11) + +------------------------------------------------------------------- +Wed Sep 3 13:01:54 CEST 2014 - r...@suse.de + +- update to version 6.3 + - smartctl: Fixed bogus error messages from '-g/-s wcreorder'. + - smartctl prints ATA form factor. + - SCSI: Improved support of modern disks (SAS SSDs). + - SCSI: Fixed sense data noise from old disks. + - update-smart-drivedb man page. + - configure option '--with-smartdscriptdir'. + - configure option '--with-smartdplugindir'. + - configure option '--with-systemdenvfile'. + - configure option '--with-working-snprintf'. + - Removed build time stamps to support reproducible builds. + - Compile fixes for C++11. + - HDD, SSD and USB additions to drive database. + - Linux: Support for controllers behind AACRAID driver. + - Linux: Fixed DEVICESCAN max path count. + - FreeBSD: Fixed possible crash caused by wrong SCSI error handling. + - FreeBSD: Compile fix for kFreeBSD. + - Windows: Reworked CSMI port scanning. + - QNX: Compile fix. +- dropped patches: + smartmontools-nobuild-date.patch (code removed upstream) + +------------------------------------------------------------------- Old: ---- smartmontools-6.2.tar.gz smartmontools-6.2.tar.gz.asc smartmontools-nobuild-date.patch New: ---- smartmontools-6.3.tar.gz smartmontools-6.3.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.udr4vB/_old 2014-09-09 18:59:52.000000000 +0200 +++ /var/tmp/diff_new_pack.udr4vB/_new 2014-09-09 18:59:52.000000000 +0200 @@ -29,7 +29,7 @@ # http://sourceforge.net/p/smartmontools/code/HEAD/tree/branches/RELEASE_5_43_DRIVEDB/smartmontools/drivedb.h#l78 (3850) # http://sourceforge.net/p/smartmontools/code/HEAD/tree/branches/RELEASE_6_0_DRIVEDB/smartmontools/drivedb.h#l78 (3850) # http://sourceforge.net/p/smartmontools/code/HEAD/tree/trunk/smartmontools/drivedb.h#l78 (3856) -Version: 6.2 +Version: 6.3 Release: 0 Source: http://sourceforge.net/projects/smartmontools/files/smartmontools/%{version}/%{name}-%{version}.tar.gz Source1: %{name}-%{version}.tar.gz.asc @@ -46,8 +46,6 @@ Patch1: smartmontools-default-enabled.patch # PATCH-FEATURE-OPENSUSE smartmontools-removable.patch sbra...@suse.cz -- Skip removable devices. (bnc#308557) Report raw temperature. Patch4: smartmontools-removable.patch -# SUSE-FEATURE-PATCH smartmontools-nobuild-date.patch bnc#647521 pgaj...@suse.cz -Patch8: smartmontools-nobuild-date.patch # PATCH-FIX-OPENSUSE smartmontools-var-lock-subsys.patch sbra...@suse.cz -- Do not use unsupported /var/lock/subsys. Patch10: smartmontools-var-lock-subsys.patch # PATCH-FEATURE-OPENSUSE smartd-service-novm.patch crrodrig...@opensuse.org -- Do not start smartd in virtual environment. @@ -70,9 +68,9 @@ %endif %if 0%{?suse_version} >= 1130 BuildRequires: libcap-ng-devel -%endif BuildRequires: pkgconfig(systemd) %{?systemd_requires} +%endif Summary: Monitor for SMART devices License: GPL-2.0+ Group: Hardware/Other @@ -99,7 +97,6 @@ cp -a %{SOURCE7} drivedb.h %patch1 %patch4 -%patch8 -p1 %patch10 -p1 %patch11 # PATCH-FEATURE-OPENSUSE (sed on smartd.service.in) sbra...@suse.cz -- Use generated smartd_opts (from SUSE sysconfig file). Systemd smartd.service cannot be smart enough to parse SUSE sysconfig file and generate smartd_opts on fly. And we do not want to launch shell just for it in every boot. @@ -116,7 +113,9 @@ %if 0%{?suse_version} >= 1110 --with-selinux\ %endif +%if 0%{?suse_version} >= 1130 --with-systemdsystemunitdir=%{_unitdir}\ +%endif --enable-drivedb\ --enable-savestates\ --enable-attributelog @@ -142,7 +141,9 @@ cat >%{buildroot}%{_sysconfdir}/smart_drivedb.h <<EOF /* smart_drivedb.h: Custom drive database. See also %{_datadir}/smartmontools/drivedb.h. */ EOF +%if 0%{?suse_version} >= 1130 cp smartd.service %{buildroot}/%{_unitdir} +%endif # INSTALL file is intended only for packagers. rm %{buildroot}%{_defaultdocdir}/%{name}/INSTALL # Check syntax of drivedb.h that may come from a later snapshot (code from update-smart-drivedb) @@ -160,7 +161,9 @@ rm -rf %{buildroot} %pre +%if 0%{?suse_version} >= 1130 %service_add_pre smartd.service +%endif # Intelligent drivedb.h update, part 1. # Save installed drivedb.h. Maybe the sysadmin called update-smart-drivedb, # and the installed drivedb.h may be even newer than the new packaged one. @@ -172,14 +175,20 @@ %post # First prepare sysconfig. +%if 0%{?suse_version} >= 1130 %{fillup_only} +%else +%{fillup_and_insserv -f -y smartd} +%endif %if 0%{?suse_version} > 1140 # 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 +%if 0%{?suse_version} >= 1130 %service_add_post smartd.service +%endif # Intelligent drivedb.h update, part 2. # Now we have the old system drivedb.h and the new packaged drivedb.h. if test -f %{_datadir}/smartmontools/drivedb.h.rpmsave ; then @@ -200,10 +209,19 @@ fi %preun +%if 0%{?suse_version} >= 1130 %service_del_preun smartd.service +%else +%{stop_on_removal smartd} +%endif %postun +%if 0%{?suse_version} >= 1130 %service_del_postun smartd.service +%else +%{restart_on_update smartd} +%{insserv_cleanup} +%endif %files %defattr(-, root, root) @@ -218,7 +236,11 @@ %if 0%{?suse_version} <= 1100 || 0%{?suse_version} > 1140 %{_prefix}/lib/smartmontools %endif +%if 0%{?suse_version} >= 1130 %{_unitdir}/* +%else +%{_sysconfdir}/init.d/smartd +%endif %{_sbindir}/* %config(noreplace) %{_sysconfdir}/smart_drivedb.h %config(noreplace) %{_sysconfdir}/smartd.conf ++++++ smartd-service-novm.patch ++++++ --- /var/tmp/diff_new_pack.udr4vB/_old 2014-09-09 18:59:52.000000000 +0200 +++ /var/tmp/diff_new_pack.udr4vB/_new 2014-09-09 18:59:52.000000000 +0200 @@ -1,10 +1,10 @@ Index: smartd.service.in -=================================================================== ---- smartd.service.in.orig +================================================================================ +--- smartd.service.in +++ smartd.service.in -@@ -1,6 +1,7 @@ - [Unit] +@@ -2,6 +2,7 @@ Description=Self Monitoring and Reporting Technology (SMART) Daemon + Documentation=man:smartd(8) man:smartd.conf(5) After=syslog.target +ConditionVirtualization=false ++++++ smartmontools-6.2.tar.gz -> smartmontools-6.3.tar.gz ++++++ ++++ 11757 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
