Accepting request 260197 from home:gary_lin:branches:Base:System

- Add efivar-correct-license-header.patch to correct the license of
  util.h
- Amend the spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/260197
OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=3

efivar-correct-license-header.patch

@@ -0,0 +1,47 @@
+From f41c4b36f83cd33f7eeef0daa76712073d6aec5f Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 6 Nov 2014 12:14:59 -0500
+Subject: [PATCH] Make the license terms of util.h be right.
+
+This code is all mine, so there's nothing weird going on here, I just
+put the wrong license blurb in the file.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/util.h | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/util.h b/src/util.h
+index 1cd59d2..189350c 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -2,17 +2,18 @@
+  * Copyright 2011-2014 Red Hat, Inc.
+  * All rights reserved.
+  *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; version 2 of the License.
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation;
++ * version 2.1 of the License.
+  *
+- * This program is distributed in the hope that it will be useful,
++ * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
+  *
+- * You should have received a copy of the GNU General Public License
+- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+  *
+  * Author(s): Peter Jones <pjones@redhat.com>
+  */
+-- 
+1.8.4.5
+

efivar.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  7 02:20:06 UTC 2014 - glin@suse.com
+
+- Add efivar-correct-license-header.patch to correct the license of
+  util.h
+- Amend the spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Wed Oct 29 04:00:49 UTC 2014 - glin@suse.com
 

efivar.spec

@@ -25,6 +25,7 @@ Group:          Development/Libraries/Other
 Url:            https://github.com/vathpela/efivar
 Source0:        https://github.com/vathpela/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         efivar-suse-build.patch
+Patch1:         efivar-correct-license-header.patch
 BuildRequires:  pkg-config
 BuildRequires:  popt-devel
 Requires:       libefivar0 = %{version}-%{release}
@@ -48,18 +49,16 @@ Requires:       libefivar0 = %{version}-%{release}
 development headers required to use libefivar.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-make libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="%{optflags}"
 
 %install
 make DESTDIR=%{buildroot} libdir=%{_libdir} install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -n libefivar0 -p /sbin/ldconfig
 
 %postun -n libefivar0 -p /sbin/ldconfig