From b51c4988718ecb75cd45d64db79dea03200222003d1df5cf39435bdba993e335 Mon Sep 17 00:00:00 2001
From: Torsten Gruner <t.gruner@katodev.de>
Date: Wed, 7 Oct 2015 11:13:59 +0000
Subject: [PATCH] Accepting request 336967 from home:Simmphonie:yubico

OBS-URL: https://build.opensuse.org/request/show/336967
OBS-URL: https://build.opensuse.org/package/show/security/pam_u2f?expand=0&rev=2
---
 baselib.conf             |   2 ++
 pam_u2f-1.0.1.tar.gz     |   3 ---
 pam_u2f-1.0.2.tar.gz     |   3 +++
 pam_u2f-1.0.2.tar.gz.sig | Bin 0 -> 287 bytes
 pam_u2f.changes          |   9 +++++++++
 pam_u2f.spec             |  25 ++++++++++++-------------
 6 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 baselib.conf
 delete mode 100644 pam_u2f-1.0.1.tar.gz
 create mode 100644 pam_u2f-1.0.2.tar.gz
 create mode 100644 pam_u2f-1.0.2.tar.gz.sig

diff --git a/baselib.conf b/baselib.conf
new file mode 100644
index 0000000..5df3c11
--- /dev/null
+++ b/baselib.conf
@@ -0,0 +1,2 @@
+pam_yubico
+  supplements "packageand(pam_yubico:pam-<targettype>)"
diff --git a/pam_u2f-1.0.1.tar.gz b/pam_u2f-1.0.1.tar.gz
deleted file mode 100644
index 4d42b5f..0000000
--- a/pam_u2f-1.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d77dd150d65836c7b9a12d75d22159484663c11cea5739653bf31c44a3609522
-size 347979
diff --git a/pam_u2f-1.0.2.tar.gz b/pam_u2f-1.0.2.tar.gz
new file mode 100644
index 0000000..7980503
--- /dev/null
+++ b/pam_u2f-1.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:800b285ba61910aef2b61e38c1e5647848c824a1d1e18130a74a84e3f6ea8f47
+size 347824
diff --git a/pam_u2f-1.0.2.tar.gz.sig b/pam_u2f-1.0.2.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..93c55479e7addfef003e659e16326ff37a0931046737e743b77e3c453953eee6
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-zRw;TWp2@sIW1Y6UYM*%7|2me_+@Qz9Dbg?4<m@b-^
z0B?(qUNOePyD%1=Fv0dja|-j#Kq~0S{e%d<Bx?6<pvv@RG{eY3ITP*7GbuK2dB$xt
z$xzKB1(~_SjA}nEVd@*^W)WV$ZcK5$DZk;tDom`4DIbduOs0;3r3UaSfW_j$9Q=8S
zDxPP{wlgR8jbX#4G{7uz|NJVgh*N7n^m~MRK|-(o^mPX*ArlKTFD9?Rf&T%?>MNfQ
zs3H)CBG6R*b%hoP=$>ox2j6dcd7L}J2GUdue#;urwU4c1JM~v$CINYELf9StaS44*
lc#8rFe)e%9(l_2ECUM#B>Jza%h0Pw_@pLT4zUsA8cnK}1f$jhR

literal 0
HcmV?d00001

diff --git a/pam_u2f.changes b/pam_u2f.changes
index c8fdaa9..58d6861 100644
--- a/pam_u2f.changes
+++ b/pam_u2f.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Oct  6 14:11:20 UTC 2015 - t.gruner@katodev.de
+
+- Version 1.0.2 (released 2015-10-06)
+  - Changes to automake flags.
+  - Improve build on OS X.
+- Cleanup .spec file
+- Add baselib.conf
+
 -------------------------------------------------------------------
 Wed Jul  8 21:23:52 UTC 2015 - t.gruner@katodev.de
 
diff --git a/pam_u2f.spec b/pam_u2f.spec
index 8caebcf..bb206bd 100644
--- a/pam_u2f.spec
+++ b/pam_u2f.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package 
+# spec file for package pam_u2f
 #
 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -15,21 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Name:           pam_u2f
-Version:        1.0.1
+Version:        1.0.2
 Release:        0
 Summary:        Allows you to use U2F to authenticate against PAM
-Group:          Productivity/Networking/Security
 License:        BSD-2-Clause
-URL:            https://developers.yubico.com
+Group:          Productivity/Networking/Security
+Url:            https://developers.yubico.com
 Source0:        https://developers.yubico.com/pam-u2f/Releases/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  pkg-config
+Source1:        https://developers.yubico.com/pam-u2f/Releases/%{name}-%{version}.tar.gz.sig
+Source2:        baselib.conf
 BuildRequires:  pam-devel
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(u2f-host)
 BuildRequires:  pkgconfig(u2f-server)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The PAM U2F module provides an easy way to integrate the Yubikey
@@ -38,16 +39,14 @@ authentication infrastructure. PAM is used by GNU/Linux, Solaris
 and Mac OS X for user authentication.
 
 %prep
-%setup -q 
+%setup -q
 
 %build
-%configure --enable-static=no --with-pic --with-pam-dir=/%{_lib}/security --bindir=%{_bindir}
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
+%configure --bindir=%{_bindir} --with-pam-dir=/%{_lib}/security --disable-static --disable-silent-rules
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %files