From 80517088deb19b0fa79f7608f044485c85db98ff3f4e30864d8d81db928e8989 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 08:59:42 +0000 Subject: [PATCH 1/3] Accepting request 287070 from home:pluskalm:branches:Base:System - Cleanup spec file with spec-cleaner - Add gpg signature OBS-URL: https://build.opensuse.org/request/show/287070 OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=28 --- dmidecode-2.12.tar.bz2.sig | Bin 0 -> 287 bytes dmidecode.changes | 6 ++++++ dmidecode.keyring | 0 dmidecode.spec | 24 +++++++++++++----------- 4 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 dmidecode-2.12.tar.bz2.sig create mode 100644 dmidecode.keyring diff --git a/dmidecode-2.12.tar.bz2.sig b/dmidecode-2.12.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..4c2aa4c4d14dd8bce778fdbf9804c0d54703f50b8a31934d468416d49ccb995f GIT binary patch literal 287 zcmV+)0pR|L0UQJX0RjL91p-lSmVE#U2@pFV0o`T2rIcCZ2meXVh#$p&+ePoQ@R#l= zf}HB}zQ51Kwxg5dWuf_;z`cw`m504ex4%#}E&+q@?AvZNL9_8QySczT{f2UP_g1~; zp(C}b90XAmrvrBrvYmwh7|fgen|NL;=hJSKuVb lDD@nZ_-e#Lnsq0;g?ty|!kn~*ftAJfLf&_FcZW(%u8tN8l3@S< literal 0 HcmV?d00001 diff --git a/dmidecode.changes b/dmidecode.changes index bd5d6a4..c24989a 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 20 20:55:12 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Add gpg signature + ------------------------------------------------------------------- Mon Oct 13 14:00:09 CEST 2014 - jdelvare@suse.de diff --git a/dmidecode.keyring b/dmidecode.keyring new file mode 100644 index 0000000..473a0f4 diff --git a/dmidecode.spec b/dmidecode.spec index ec0c4e6..34f1e9e 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ # # spec file for package dmidecode # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,23 +17,25 @@ Name: dmidecode -Url: http://www.nongnu.org/dmidecode/ Version: 2.12 Release: 0 -Provides: pmtools:/usr/sbin/dmidecode Summary: DMI table decoder License: GPL-2.0+ Group: System/Console -Source: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Url: http://www.nongnu.org/dmidecode/ +Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2.sig +Source2: %{name}.keyring Patch1: dmidecode-1.173-drop-cast.patch Patch2: dmidecode-1.175-fix-SMBIOS-2.8.0.patch Patch3: dmidecode-1.176-SMBIOS-2.8-is-supported.patch Patch4: dmidecode-1.177-decode-pcie3-slot-id.patch Patch5: dmidecode-1.181-decode-CPUID-recent-AMD.patch Patch6: dmidecode-1.182-decode-ddr4-memory-type.patch +Provides: pmtools:%{_sbindir}/dmidecode +Obsoletes: pmtools < 20071117 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 %arm aarch64 -Obsoletes: pmtools < 20071117 %description Dmidecode reports information about your system's hardware as described @@ -50,7 +52,7 @@ trusted. Dmidecode does not scan your hardware, it only reports what the BIOS told it to. %prep -%setup +%setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -59,10 +61,10 @@ the BIOS told it to. %patch6 -p1 %build -make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make CFLAGS="%{optflags}" %{?_smp_mflags} %install -install -dm 755 %{buildroot}/usr/sbin +install -dm 755 %{buildroot}%{_sbindir} install -dm 755 %{buildroot}%{_mandir}/man8 install -dm 755 %{buildroot}%{_docdir}/%{name} %ifarch ia64 %arm aarch64 @@ -70,15 +72,15 @@ for i in dmidecode ; do %else for i in dmidecode vpddecode ownership biosdecode ; do %endif -install -m 755 $i %{buildroot}/usr/sbin/ +install -m 755 $i %{buildroot}%{_sbindir}/ install -m 644 man/$i.8 %{buildroot}%{_mandir}/man8/ install -m 644 AUTHORS CHANGELOG LICENSE README %{buildroot}%{_docdir}/%{name}/ done %files %defattr(-,root,root) -/usr/sbin/* +%{_sbindir}/* %doc %{_docdir}/%{name} -/%{_mandir}/man8/* +%{_mandir}/man8/* %changelog From bcd34337f14267c479c20fb5778b46ae76d4e5f1c274c3e60a17ae78724bb790 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 09:08:19 +0000 Subject: [PATCH 2/3] - dmidecode.keyring was empty, reference the savannah keyring. but the tarball is signed by someone unknown without gpg signatures, so no keyring for now. OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=29 --- dmidecode.changes | 7 +++++++ dmidecode.spec | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dmidecode.changes b/dmidecode.changes index c24989a..64402d5 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Feb 22 09:07:28 UTC 2015 - meissner@suse.com + +- dmidecode.keyring was empty, reference the savannah keyring. + but the tarball is signed by someone unknown without gpg signatures, + so no keyring for now. + ------------------------------------------------------------------- Fri Feb 20 20:55:12 UTC 2015 - mpluskal@suse.com diff --git a/dmidecode.spec b/dmidecode.spec index 34f1e9e..790f3b5 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -25,7 +25,9 @@ Group: System/Console Url: http://www.nongnu.org/dmidecode/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2.sig -Source2: %{name}.keyring +# would be, but tarball is signed by someone else without signatures. +# https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode +# Source2: %{name}.keyring Patch1: dmidecode-1.173-drop-cast.patch Patch2: dmidecode-1.175-fix-SMBIOS-2.8.0.patch Patch3: dmidecode-1.176-SMBIOS-2.8-is-supported.patch From a619c4af30c83f25f5ac6ddf923eb005ce8df27a220f21aca39fd0c518f4a622 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Feb 2015 09:18:49 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=30 --- dmidecode.keyring | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dmidecode.keyring diff --git a/dmidecode.keyring b/dmidecode.keyring deleted file mode 100644 index 473a0f4..0000000