From 249d171d34a9e7cdadbc99de4d9ef0bd9fac8ab696e7cf4c6437749f63d491dd Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 9 Dec 2012 17:50:22 +0000
Subject: [PATCH] gpg; ofl, fd0ssh

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=44
---
 pam_mount.changes |  8 ++++++++
 pam_mount.spec    | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pam_mount.changes b/pam_mount.changes
index e584bf7..2d82180 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Dec  9 17:48:35 UTC 2012 - jengelh@inai.de
+
+- Avoid running fdupes on /etc
+- Depend on gpg-offline only for openSUSE >= 12.3
+- Do require ofl and fd0ssh now, as they are now separate
+  installables starting with 12.3
+
 -------------------------------------------------------------------
 Thu Nov 29 18:23:56 CET 2012 - sbrabec@suse.cz
 
diff --git a/pam_mount.spec b/pam_mount.spec
index ed0b590..6a2187c 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -35,15 +35,17 @@ Source6:        %{name}.keyring
 Patch1:         pam_mount-0.47-enable-logout-kill.dif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
+%if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
+%endif
 BuildRequires:  libtool
+# LOOP64 support:
+BuildRequires:  linux-glibc-devel >= 2.6
+BuildRequires:  man
 BuildRequires:  pam-devel >= 0.99
 BuildRequires:  perl-XML-Parser
 BuildRequires:  perl-XML-Writer
-# LOOP64 support:
-BuildRequires:  fdupes
-BuildRequires:  linux-glibc-devel >= 2.6
-BuildRequires:  man
 BuildRequires:  pkgconfig >= 0.19
 BuildRequires:  xz
 BuildRequires:  pkgconfig(libHX) >= 3.12.1
@@ -58,6 +60,8 @@ Requires:       device-mapper >= 1.02.48
 # for mount(8) and mount.cifs:
 Requires:       util-linux
 Recommends:     cifs-mount
+Requires:       fd0ssh
+Requires:       ofl
 # for fd0ssh and ofl:
 Suggests:       hxtools >= 20090116
 
@@ -96,7 +100,9 @@ setup. It supports pam_mount style plain EHD2/OpenSSL images and LUKS
 and transparent use of the OS's crypto layer.
 
 %prep
+%if 0%{?gpg_verify:1}
 %gpg_verify %{S:9}
+%endif
 %setup -q
 %patch -P 1 -p1
 
@@ -107,7 +113,7 @@ and transparent use of the OS's crypto layer.
 make %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR="%buildroot";
 # Remove static and libtool version
 rm -f "%buildroot/%_lib/security"/*.{a,la} "%buildroot/%_libdir"/*.la
 #install the docs
@@ -122,7 +128,7 @@ mkdir -p %buildroot%_sbindir/
 mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/
 ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt
 install -m755 %SOURCE3 %buildroot/sbin/
-%fdupes %buildroot
+%fdupes %buildroot/%_prefix
 
 %post
 if [ -e etc/security/pam_mount.conf ]