[pam_mapi/f21: 3/3] - Upgrade to 0.2.1 - Apply https://fedoraproject.org/wiki/Features/UsrMove

[Robert Scheck]

commit e90a2e281addb1f6bcaac8908d8098174c7fc022
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Mar 21 18:06:04 2015 +0100

    - Upgrade to 0.2.1
    - Apply https://fedoraproject.org/wiki/Features/UsrMove

 pam_mapi.spec | 21 ++++++++++++++++++---
 sources       |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/pam_mapi.spec b/pam_mapi.spec
index 4704f6a..d5de812 100644
--- a/pam_mapi.spec
+++ b/pam_mapi.spec
@@ -2,8 +2,8 @@
 
 Summary:	PAM module for authentication via MAPI against a Zarafa server
 Name:		pam_mapi
-Version:	0.2.0
-Release:	4%{?dist}
+Version:	0.2.1
+Release:	1%{?dist}
 License:	BSD and GPLv2+
 Group:		System Environment/Base
 URL:		http://linux.robert-scheck.de/software/%{name}/
@@ -12,6 +12,8 @@ BuildRequires:	zarafa-devel >= 6.20.0, pam-devel, %{_includedir}/uuid/uuid.h, zl
 %if 0%{?rhel}%{?fedora} > 4
 BuildRequires:	libicu-devel >= 3.4
 %endif
+# Zarafa unfortunately does not seem to care about soname versioning at all
+Requires:	zarafa-client < 7.2.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -34,7 +36,12 @@ a simple setup. Please read the documentation for more extended configurations.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib}
+%configure \
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+  --libdir=%{_libdir}
+%else
+  --libdir=/%{_lib}
+%endif
 make %{?_smp_mflags}
 
 %install
@@ -47,10 +54,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README pam.conf
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+%{_libdir}/security/%{name}.so
+%else
 /%{_lib}/security/%{name}.so
+%endif
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Mar 21 2015 Robert Scheck <robert at fedoraproject.org> 0.2.1-1
+- Upgrade to 0.2.1
+- Apply https://fedoraproject.org/wiki/Features/UsrMove
+
 * Mon Jan 26 2015 David Tardon <dtardon at redhat.com> - 0.2.0-4
 - rebuild for ICU 54.1
 
diff --git a/sources b/sources
index 5bb5fcb..165b850 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1c52fb733482cf3bc3c133e6bd43652  pam_mapi-0.2.0.tar.gz
+dbcede8b82bda7121170b63a17d8262e  pam_mapi-0.2.1.tar.gz