From 57367173d14d81fcfa2e5ab6a9ac0b4767c0b7b9 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 25 Jan 2021 20:53:22 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/smartmontools.git#4da015eb25e67b80691c6d06b7ec2e655bf4397d
---
 drivedb.h          |  4 ++--
 smartmontools.spec | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivedb.h b/drivedb.h
index ce899d7..fd56cd5 100644
--- a/drivedb.h
+++ b/drivedb.h
@@ -68,7 +68,7 @@
 /*
 const drive_settings builtin_knowndrives[] = {
  */
-  { "VERSION: 7.3 $Id: drivedb.h 5170 2021-01-17 16:11:20Z chrfranke $",
+  { "VERSION: 7.2/5170 2021-01-17 16:11:20 $Id: drivedb.h 5171 2021-01-17 17:17:19Z chrfranke $",
     "-", "-",
     "Version information",
     ""
@@ -5892,7 +5892,7 @@ const drive_settings builtin_knowndrives[] = {
     "0x174c:0x2362",
     "",
     "",
-    "-d sntasmedia"
+    "" // smartmontools >= r5168: -d sntasmedia
   },
   { "USB: ; ASMedia",
     "0x174c:0x....",
diff --git a/smartmontools.spec b/smartmontools.spec
index 45d2623..38b0b91 100644
--- a/smartmontools.spec
+++ b/smartmontools.spec
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	7.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPLv2+
 URL:		http://smartmontools.sourceforge.net/
@@ -32,14 +32,17 @@ failure.
 %prep
 %setup -q 
 %patch1 -p1 -b .defaultconf
-
-# update SOURCE5 on maintainer's machine prior commiting, there's no internet connection on builders
-curl %{UrlSource5} -o %{SOURCE5} ||:
 cp %{SOURCE5} .
 
 %build
 autoreconf -i
 %configure --with-selinux --with-libcap-ng=yes --with-libsystemd --with-systemdsystemunitdir=%{_unitdir} --sysconfdir=%{_sysconfdir}/%{name}/ --with-systemdenvfile=%{_sysconfdir}/sysconfig/%{name}
+
+# update SOURCE5 on maintainer's machine prior commiting, there's no internet connection on builders
+%make_build update-smart-drivedb
+./update-smart-drivedb -s - -u sf drivedb.h ||:
+cp drivedb.h ../drivedb.h ||:
+
 %make_build CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
 %install
@@ -83,6 +86,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
 %{_sharedstatedir}/%{name}
 
 %changelog
+* Mon Jan 25 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.2-2
+- make sure correct version of drivedb.h is used (#1918946)
+
 * Mon Jan 18 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.2-1
 - smartmontools updated to 7.2