From 44183134f186d1d6746c84e3a4ca2469bf1afae7bdb850de97c02a6a06a055f1 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 14 Jan 2019 15:33:32 +0000 Subject: [PATCH 1/2] - Don't overwrite the path of license (boo#1121851). OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=49 --- dmidecode.changes | 5 +++++ dmidecode.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dmidecode.changes b/dmidecode.changes index 3bf2b2d..c294de6 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 14 16:32:30 CET 2019 - jdelvare@suse.de + +- Don't overwrite the path of license (boo#1121851). + ------------------------------------------------------------------- Mon Oct 22 14:51:29 CEST 2018 - jdelvare@suse.de diff --git a/dmidecode.spec b/dmidecode.spec index c840daa..ae2a91b 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ # # spec file for package dmidecode # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ Name: dmidecode Version: 3.2 Release: 0 Summary: DMI table decoder -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Console Url: http://www.nongnu.org/dmidecode/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz @@ -66,7 +66,7 @@ for i in dmidecode vpddecode ownership biosdecode ; do %endif install -m 755 $i %{buildroot}%{_sbindir}/ install -m 644 man/$i.8 %{buildroot}%{_mandir}/man8/ -install -m 644 AUTHORS NEWS LICENSE README %{buildroot}%{_docdir}/%{name}/ +install -m 644 AUTHORS NEWS README %{buildroot}%{_docdir}/%{name}/ done %files @@ -75,8 +75,8 @@ done %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/AUTHORS %doc %{_docdir}/%{name}/NEWS -%license %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README %{_mandir}/man8/* +%license LICENSE %changelog From 5864d6a83b71a422a06ef0ecd8fb3c6c693d12a635ceb2959e5f93a6181f9a03 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 16 Jan 2019 09:26:04 +0000 Subject: [PATCH 2/2] - dmidecode-add-logical-non-volatile-device.patch: Add "Logical non-volatile device" to the memory device types (bsc#1120149). - Use %doc directly on files instead of installing them explicitly. OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=50 --- ...code-add-logical-non-volatile-device.patch | 34 +++++++++++++++++++ dmidecode.changes | 7 ++++ dmidecode.spec | 7 ++-- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 dmidecode-add-logical-non-volatile-device.patch diff --git a/dmidecode-add-logical-non-volatile-device.patch b/dmidecode-add-logical-non-volatile-device.patch new file mode 100644 index 0000000..b1bb775 --- /dev/null +++ b/dmidecode-add-logical-non-volatile-device.patch @@ -0,0 +1,34 @@ +From: Jean Delvare +Date: Wed, 16 Jan 2019 09:04:55 +0100 +Subject: dmidecode: Add "Logical non-volatile device" to the memory device types +Git-commit: 74dfb854b8199ddb0a27e89296fa565f4706cb9d +Patch-mainline: yes +References: bsc#1120149 + +When adding support for non-volative memory, we forgot to add +"Logical non-volatile device" to the list of memory types. This +causes NVDIMM modules to show up as . Fix the problem +by adding the missing enumerated value. + +Signed-off-by: Jean Delvare +Reviewed-by: Jerry Hoemann +--- + dmidecode.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2469,10 +2469,11 @@ static const char *dmi_memory_device_typ + "LPDDR", + "LPDDR2", + "LPDDR3", +- "LPDDR4" /* 0x1E */ ++ "LPDDR4", ++ "Logical non-volatile device" /* 0x1F */ + }; + +- if (code >= 0x01 && code <= 0x1E) ++ if (code >= 0x01 && code <= 0x1F) + return type[code - 0x01]; + return out_of_spec; + } diff --git a/dmidecode.changes b/dmidecode.changes index c294de6..96876fc 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 16 09:23:52 UTC 2019 - jdelvare@suse.de + +- dmidecode-add-logical-non-volatile-device.patch: Add "Logical + non-volatile device" to the memory device types (bsc#1120149). +- Use %doc directly on files instead of installing them explicitly. + ------------------------------------------------------------------- Mon Jan 14 16:32:30 CET 2019 - jdelvare@suse.de diff --git a/dmidecode.spec b/dmidecode.spec index ae2a91b..a6fb080 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -28,6 +28,7 @@ Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{vers # https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode Source2: %{name}.keyring Patch1: dmidecode-fix-redfish-hostname-print-length.patch +Patch2: dmidecode-add-logical-non-volatile-device.patch Provides: pmtools:%{_sbindir}/dmidecode Obsoletes: pmtools < 20071117 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,6 +52,7 @@ the BIOS told it to. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build make CFLAGS="%{optflags}" %{?_smp_mflags} @@ -66,16 +68,13 @@ for i in dmidecode vpddecode ownership biosdecode ; do %endif install -m 755 $i %{buildroot}%{_sbindir}/ install -m 644 man/$i.8 %{buildroot}%{_mandir}/man8/ -install -m 644 AUTHORS NEWS README %{buildroot}%{_docdir}/%{name}/ done %files %defattr(-,root,root) %{_sbindir}/* %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/AUTHORS -%doc %{_docdir}/%{name}/NEWS -%doc %{_docdir}/%{name}/README +%doc AUTHORS NEWS README %{_mandir}/man8/* %license LICENSE