From 8b7d8e2f31238d60b7285fd1fae830fcd22670f0 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspacek@redhat.com>
Date: Wed, 3 Jun 2015 09:57:40 +0200
Subject: [PATCH] - Rebase to upstream version 2.0.0rc1

---
 softhsm.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/softhsm.spec b/softhsm.spec
index 009b282..a20f73d 100644
--- a/softhsm.spec
+++ b/softhsm.spec
@@ -1,21 +1,18 @@
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
-Version: 2.0.0b1
-Release: 4%{?dist}
+Version: 2.0.0rc1
+Release: 1%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://dist.opendnssec.org/source/testing/%{name}-%{version}.tar.gz
-Source1: softhsm.module
+Source1: http://dist.opendnssec.org/source/testing/%{name}-%{version}.tar.gz.sig
+Source2: softhsm.module
 # taken from coolkey which is not build on all arches we build on
-Source2: softhsm2-pk11install.c
-Patch1: softhsm-v2.0.0b1-aes-key-wrap.patch
-Patch2: softhsm-v2.0.0b1-ckm-rsa-pkcs-oaep-key-wrap.patch
+Source3: softhsm2-pk11install.c
 
 Group: Applications/System
 BuildRequires: openssl-devel, sqlite-devel >= 3.4.2, cppunit-devel
 BuildRequires: gcc-c++, pkgconfig, p11-kit-devel, nss-devel
-# for snapshot only - or when our patches touches .m4 files
-BuildRequires: autoconf, libtool, automake
 
 Requires(pre): shadow-utils
 Requires: p11-kit, nss-tools
@@ -35,14 +32,14 @@ with other cryptographic products because of the PKCS#11 interface.
 Summary: Development package of softhsm that includes the header files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}, openssl-devel, sqlite-devel
+BuildRequires: autoconf, libtool, automake
 
 %description devel
 The devel package contains the libsofthsm include files
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+autoreconf -fiv
 
 # remove softhsm/ subdir auto-added to --libdir
 sed -i "s:full_libdir/softhsm:full_libdir:g" configure
@@ -50,13 +47,12 @@ sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
 sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
 
 %build
-autoreconf --install --force
 %configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --disable-gost \
            --with-migrate --enable-visibility
 
 make %{?_smp_mflags}
 # install our copy of pk11install taken from coolkey package
-cp %{SOURCE2} .
+cp %{SOURCE3} .
 gcc $(pkg-config --cflags nss) %{optflags} -c softhsm2-pk11install.c
 gcc $(pkg-config --libs nss) -lpthread  -lsoftokn3 -ldl -lz %{optflags} softhsm2-pk11install.o -o softhsm2-pk11install
 
@@ -66,7 +62,7 @@ make check
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-install -D %{SOURCE1} %{buildroot}/%{_datadir}/p11-kit/modules/softhsm.module
+install -D %{SOURCE2} %{buildroot}/%{_datadir}/p11-kit/modules/softhsm.module
 
 rm %{buildroot}/%{_sysconfdir}/softhsm2.conf.sample
 rm -f %{buildroot}/%{_libdir}/pkcs11/*a
@@ -119,6 +115,9 @@ if [ -f /var/softhsm/slot0.db ]; then
 fi
 
 %changelog
+* Mon Jun 01 2015 Petr Spacek <pspacek@redhat.com> - 2.0.0rc1-1
+- Rebase to latest upstream release
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.0.0b1-4
 - Rebuilt for GCC 5 C++11 ABI change