From edf9fa1d9e012665f93a70c4d643d7a9508d33a9d5fed0c9ee92b83870246680 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 16 May 2014 15:56:23 +0000
Subject: [PATCH] Accepting request 233729 from devel:libraries:c_c++

- Cleanup with spec-cleaner
- Paralelize test run

OBS-URL: https://build.opensuse.org/request/show/233729
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnettle?expand=0&rev=16
---
 libnettle.changes |  6 ++++++
 libnettle.spec    | 29 +++++++++--------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/libnettle.changes b/libnettle.changes
index 82151f4..4dacf47 100644
--- a/libnettle.changes
+++ b/libnettle.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 13 13:35:51 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Paralelize test run
+
 -------------------------------------------------------------------
 Thu Dec 19 12:58:12 UTC 2013 - meissner@suse.com
 
diff --git a/libnettle.spec b/libnettle.spec
index 22b3c22..ee0d3f6 100644
--- a/libnettle.spec
+++ b/libnettle.spec
@@ -1,8 +1,7 @@
-# vim: set sw=3 ts=3 noet:
 #
 # spec file for package libnettle
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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,22 +16,22 @@
 #
 
 
+%define soname 4
+%define hogweed_soname 2
 Name:           libnettle
 Version:        2.7.1
 Release:        0
-%define soname 4
-%define hogweed_soname 2
 Summary:        Cryptographic Library
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          System/Libraries
 Source0:        http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz
 Source1:        http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz.sig
-Source2:        %name.keyring
+Source2:        %{name}.keyring
 Source3:        baselibs.conf
 BuildRequires:  gmp-devel
 BuildRequires:  makeinfo
 BuildRequires:  pkgconfig
-PreReq:         %install_info_prereq
+Requires(post): %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,7 +40,6 @@ less any context: In crypto toolkits for object-oriented languages (C++,
 Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
 
 %package -n libnettle%{soname}
-
 Summary:        Cryptographic Library
 License:        LGPL-2.1+
 Group:          System/Libraries
@@ -52,7 +50,6 @@ less any context: In crypto toolkits for object-oriented languages (C++,
 Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
 
 %package -n libhogweed%{hogweed_soname}
-
 Summary:        Cryptographic Library for Public Key Algorithms
 License:        LGPL-2.1+
 Group:          System/Libraries
@@ -79,7 +76,6 @@ less any context: In crypto toolkits for object-oriented languages (C++,
 Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
 
 %package -n nettle
-
 Summary:        Cryptographic Tools
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          Productivity/Security
@@ -93,23 +89,21 @@ This package contains a few command-line tools to perform cryptographic
 operations using the nettle library.
 
 %prep
-%setup -q -n "nettle-%{version}"
+%setup -q -n nettle-%{version}
 
 %build
 %configure
-
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+# Not during configure as tests use it
 rm -f %{buildroot}%{_libdir}/*.a
 
 %post   -n libnettle%{soname} -p /sbin/ldconfig
-
 %postun -n libnettle%{soname} -p /sbin/ldconfig
 
 %post   -n libhogweed%{hogweed_soname} -p /sbin/ldconfig
-
 %postun -n libhogweed%{hogweed_soname} -p /sbin/ldconfig
 
 %post -n libnettle-devel
@@ -119,7 +113,7 @@ rm -f %{buildroot}%{_libdir}/*.a
 %install_info_delete --info-dir="%{_infodir}" "%{_infodir}"/nettle.info%{ext_info}
 
 %check
-make check
+make check %{?_smp_mflags}
 
 %files -n libnettle%{soname}
 %defattr(-,root,root)
@@ -149,9 +143,4 @@ make check
 %{_bindir}/sexp-conv
 %{_bindir}/nettle-hash
 
-# Local Variables:
-# mode: rpm-spec
-# tab-width: 3
-# End:
-
 %changelog