diff --git a/6000-os_linux.cpp-os_netbsd.cpp-fix-crash-on-scan-if-WITH.patch b/0000-os_linux.cpp-os_netbsd.cpp-fix-crash-on-scan-if-WITH.patch similarity index 100% rename from 6000-os_linux.cpp-os_netbsd.cpp-fix-crash-on-scan-if-WITH.patch rename to 0000-os_linux.cpp-os_netbsd.cpp-fix-crash-on-scan-if-WITH.patch diff --git a/6001-ataprint.cpp-Fix-detection-of-Device-Statistics-log-.patch b/0001-ataprint.cpp-Fix-detection-of-Device-Statistics-log-.patch similarity index 100% rename from 6001-ataprint.cpp-Fix-detection-of-Device-Statistics-log-.patch rename to 0001-ataprint.cpp-Fix-detection-of-Device-Statistics-log-.patch diff --git a/6002-drivedb.h.patch b/0002-drivedb.h.patch similarity index 100% rename from 6002-drivedb.h.patch rename to 0002-drivedb.h.patch diff --git a/6003-update-smart-drivedb.in-Include-configured-PATH-in-h.patch b/0003-update-smart-drivedb.in-Include-configured-PATH-in-h.patch similarity index 100% rename from 6003-update-smart-drivedb.in-Include-configured-PATH-in-h.patch rename to 0003-update-smart-drivedb.in-Include-configured-PATH-in-h.patch diff --git a/6004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch b/0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch similarity index 100% rename from 6004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch rename to 0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch diff --git a/6005-drivedb.h-fix-Innolite-Satadom-D150QV-entry-939.patch b/0005-drivedb.h-fix-Innolite-Satadom-D150QV-entry-939.patch similarity index 100% rename from 6005-drivedb.h-fix-Innolite-Satadom-D150QV-entry-939.patch rename to 0005-drivedb.h-fix-Innolite-Satadom-D150QV-entry-939.patch diff --git a/6006-os_freebsd.cpp-on-error-was-setting-set_nvme_err-to-.patch b/0006-os_freebsd.cpp-on-error-was-setting-set_nvme_err-to-.patch similarity index 100% rename from 6006-os_freebsd.cpp-on-error-was-setting-set_nvme_err-to-.patch rename to 0006-os_freebsd.cpp-on-error-was-setting-set_nvme_err-to-.patch diff --git a/6007-os_linux.cpp-Fix-device-scan-crash-on-missing-proc-d.patch b/0007-os_linux.cpp-Fix-device-scan-crash-on-missing-proc-d.patch similarity index 100% rename from 6007-os_linux.cpp-Fix-device-scan-crash-on-missing-proc-d.patch rename to 0007-os_linux.cpp-Fix-device-scan-crash-on-missing-proc-d.patch diff --git a/6008-smartd.cpp-Always-ignore-failure-of-ATA-SMART-ENABLE.patch b/0008-smartd.cpp-Always-ignore-failure-of-ATA-SMART-ENABLE.patch similarity index 100% rename from 6008-smartd.cpp-Always-ignore-failure-of-ATA-SMART-ENABLE.patch rename to 0008-smartd.cpp-Always-ignore-failure-of-ATA-SMART-ENABLE.patch diff --git a/6009-os_linux.cpp-Fix-d-megaraid-open-crash-on-missing-pr.patch b/0009-os_linux.cpp-Fix-d-megaraid-open-crash-on-missing-pr.patch similarity index 100% rename from 6009-os_linux.cpp-Fix-d-megaraid-open-crash-on-missing-pr.patch rename to 0009-os_linux.cpp-Fix-d-megaraid-open-crash-on-missing-pr.patch diff --git a/6010-os_darwin.cpp-os_freebsd.cpp-fix-return-value-in-err.patch b/0010-os_darwin.cpp-os_freebsd.cpp-fix-return-value-in-err.patch similarity index 100% rename from 6010-os_darwin.cpp-os_freebsd.cpp-fix-return-value-in-err.patch rename to 0010-os_darwin.cpp-os_freebsd.cpp-fix-return-value-in-err.patch diff --git a/6011-ataprint.cpp-Fix-Form-Factor-string-with-bits-set-in.patch b/0011-ataprint.cpp-Fix-Form-Factor-string-with-bits-set-in.patch similarity index 100% rename from 6011-ataprint.cpp-Fix-Form-Factor-string-with-bits-set-in.patch rename to 0011-ataprint.cpp-Fix-Form-Factor-string-with-bits-set-in.patch diff --git a/smartmontools.spec b/smartmontools.spec index 0edc2900cfb4d4f2dd2106ba454859cf1da782aa..1b886035acd7e81159680fd1a2269fdb77b915be 100644 --- a/smartmontools.spec +++ b/smartmontools.spec @@ -1,6 +1,6 @@ Name: smartmontools Version: 6.6 -Release: 8 +Release: 9 Epoch: 1 Summary: S.M.A.R.T. utility toolset License: GPLv2+ @@ -9,18 +9,18 @@ URL: http://smartmontools.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: smartmontools.sysconf -Patch6000: 6000-os_linux.cpp-os_netbsd.cpp-fix-crash-on-scan-if-WITH.patch -Patch6001: 6001-ataprint.cpp-Fix-detection-of-Device-Statistics-log-.patch -Patch6002: 6002-drivedb.h.patch -Patch6003: 6003-update-smart-drivedb.in-Include-configured-PATH-in-h.patch -Patch6004: 6004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch -Patch6005: 6005-drivedb.h-fix-Innolite-Satadom-D150QV-entry-939.patch -Patch6006: 6006-os_freebsd.cpp-on-error-was-setting-set_nvme_err-to-.patch -Patch6007: 6007-os_linux.cpp-Fix-device-scan-crash-on-missing-proc-d.patch -Patch6008: 6008-smartd.cpp-Always-ignore-failure-of-ATA-SMART-ENABLE.patch -Patch6009: 6009-os_linux.cpp-Fix-d-megaraid-open-crash-on-missing-pr.patch -Patch6010: 6010-os_darwin.cpp-os_freebsd.cpp-fix-return-value-in-err.patch -Patch6011: 6011-ataprint.cpp-Fix-Form-Factor-string-with-bits-set-in.patch +Patch0: 0000-os_linux.cpp-os_netbsd.cpp-fix-crash-on-scan-if-WITH.patch +Patch1: 0001-ataprint.cpp-Fix-detection-of-Device-Statistics-log-.patch +Patch2: 0002-drivedb.h.patch +Patch3: 0003-update-smart-drivedb.in-Include-configured-PATH-in-h.patch +Patch4: 0004-os_linux.cpp-Add-missing-braces-to-3ware-SELinux-cod.patch +Patch5: 0005-drivedb.h-fix-Innolite-Satadom-D150QV-entry-939.patch +Patch6: 0006-os_freebsd.cpp-on-error-was-setting-set_nvme_err-to-.patch +Patch7: 0007-os_linux.cpp-Fix-device-scan-crash-on-missing-proc-d.patch +Patch8: 0008-smartd.cpp-Always-ignore-failure-of-ATA-SMART-ENABLE.patch +Patch9: 0009-os_linux.cpp-Fix-d-megaraid-open-crash-on-missing-pr.patch +Patch10: 0010-os_darwin.cpp-os_freebsd.cpp-fix-return-value-in-err.patch +Patch11: 0011-ataprint.cpp-Fix-Form-Factor-string-with-bits-set-in.patch BuildRequires: groff gcc-c++ automake BuildRequires: libselinux-devel libcap-ng-devel systemd-units @@ -93,6 +93,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/%{name} %changelog +* Tue Jun 30 2020 Zhiqiang Liu - 1:6.6-9 +- renumber patches. + * Fri Jan 17 2020 openEuler Buildteam - 1:6.6-8 - Type:bugfix - ID:NA