rpms/smartmontools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

make sure correct version of drivedb.h is used (#1918946)

Browse Source
This commit is contained in:
Michal Hlavinka 2021-01-25 21:02:31 +01:00
parent 7816eed4ac
commit 4da015eb25
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivedb.h
View File

@ -68,7 +68,7 @@
/* /*
const drive_settings builtin_knowndrives[] = { 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", "Version information",
"" ""
@ -5892,7 +5892,7 @@ const drive_settings builtin_knowndrives[] = {
"0x174c:0x2362", "0x174c:0x2362",
"", "",
"", "",
"-d sntasmedia" "" // smartmontools >= r5168: -d sntasmedia
}, },
{ "USB: ; ASMedia", { "USB: ; ASMedia",
"0x174c:0x....", "0x174c:0x....",

14
smartmontools.spec
View File

@ -1,7 +1,7 @@
Summary: Tools for monitoring SMART capable hard disks Summary: Tools for monitoring SMART capable hard disks
Name: smartmontools Name: smartmontools
Version: 7.2 Version: 7.2
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
URL: http://smartmontools.sourceforge.net/ URL: http://smartmontools.sourceforge.net/
@ -32,14 +32,17 @@ failure.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .defaultconf %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} . cp %{SOURCE5} .
%build %build
autoreconf -i autoreconf -i
%configure --with-selinux --with-libcap-ng=yes --with-libsystemd --with-systemdsystemunitdir=%{_unitdir} --sysconfdir=%{_sysconfdir}/%{name}/ --with-systemdenvfile=%{_sysconfdir}/sysconfig/%{name} %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" %make_build CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
%install %install
@ -83,6 +86,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
%{_sharedstatedir}/%{name} %{_sharedstatedir}/%{name}
%changelog %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 * Mon Jan 18 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.2-1
- smartmontools updated to 7.2 - smartmontools updated to 7.2