[pam_mount] Update to new release

[Till Maas]

commit 2cb6a13b5fcaef9f0038997cd8e47a7e65998d9b
Author: Till Maas <opensource at till.name>
Date:   Wed Jun 6 21:05:54 2012 +0200

    Update to new release
    
    - Update dependencies
    - Remove obsoleted patch

 .gitignore                         |    6 ++----
 pam_mount-2.4-cmtab_location.patch |   12 ------------
 pam_mount.spec                     |   35 ++++++++++++++++++++---------------
 sources                            |    4 ++--
 4 files changed, 24 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 938322b..96efd1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-pam_mount-2.4.tar.xz
-pam_mount-2.4.tar.xz.asc
-pam_mount-2.5.tar.xz
-pam_mount-2.5.tar.xz.asc
+/pam_mount-2.13.tar.xz
+/pam_mount-2.13.tar.xz.asc
diff --git a/pam_mount.spec b/pam_mount.spec
index bd448b9..e5d6fb4 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -1,8 +1,8 @@
 %global packext xz
 
 Name:           pam_mount
-Version:        2.5
-Release:        3%{?dist}
+Version:        2.13
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -13,26 +13,23 @@ License:        LGPLv2+ and (LGPLv2 or LGPLv3) and Public Domain
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}
 Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}.asc
-# keep cmtab at /etc/cmtab to not break compatibility with older releases and to support
-# /var being on a seperate partition
-# Not upstreamable.
-Patch0:         pam_mount-2.4-cmtab_location.patch
-# Use mount -t crypt instead of mount.crypt as cryptmount command to support selinux
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel pam-devel openssl-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  cryptsetup-luks-devel >= 1.1.2
-BuildRequires:  libHX-devel >= 3.5
+BuildRequires:  libHX-devel >= 3.12.1
+BuildRequires:  libmount-devel >= 2.20
 %if %packext == lz
 BuildRequires:  lzip
 %endif
 Requires:       pam
-Requires:       libHX >= 3.5
+Requires:       libHX >= 3.12.1
 Requires:       cryptsetup-luks-libs >= 1.1.2
 %if (0%{?fedora} >= 14)
 BuildRequires:  man-db
 %endif
+Requires:       hxtools
 
 
 # Used in mtcrypt.c / mount.crypt
@@ -73,8 +70,6 @@ lzip -c -d %SOURCE0 | tar -xvvf - -C ..
 %setup -q
 %endif
 
-%patch0 -p1 -b .cmtab_location
-
 
 %build
 %configure --with-slibdir=/%{_lib} --with-dtd
@@ -101,7 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 #if [ $1 = 0 ]; then
 #/usr/bin/xmlcatalog --noout --del file://%{_datadir}/xml/pam_mount/dtds/pam_mount.conf.xml.dtd %{_sysconfdir}/catalog
 #fi
+%post -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -115,16 +112,12 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/security/pam_mount.so
 %{_sbindir}/pmvarrun
 %{_sbindir}/pmt-ehd
-%{_bindir}/pmt-fd0ssh
-%{_bindir}/pmt-ofl
 /sbin/mount.crypt
-/sbin/mount.encfs13
 /sbin/umount.crypt
 %exclude /sbin/mount.crypt_LUKS
 %exclude /sbin/umount.crypt_LUKS
 /sbin/mount.crypto_LUKS
 /sbin/umount.crypto_LUKS
-%{_mandir}/man1/pmt-fd0ssh.1*
 %{_mandir}/man5/pam_mount.conf.5*
 %{_mandir}/man8/mount.crypt.8*
 %exclude %{_mandir}/man8/mount.crypt_LUKS.8*
@@ -140,8 +133,20 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xml/pam_mount/dtd/
 %{_datadir}/xml/pam_mount/dtd/pam_mount.conf.xml.dtd
 
+# move to separate package if requested
+%exclude /usr/include/libcryptmount.h
+%exclude /usr/lib64/libcryptmount.la
+%exclude /usr/lib64/libcryptmount.so
+%{_libdir}/libcryptmount.so.0
+%{_libdir}/libcryptmount.so.0.0.0
+%exclude /usr/lib64/pkgconfig/libcryptmount.pc
 
 %changelog
+* Wed Mar 21 2012 Till Maas <opensource at till.name> - 2.13-1
+- Update to new release
+- Update dependencies
+- Remove obsoleted patch
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 79fb9ca..5aa2a3e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f005ac284ebbd600f8eb2a729da1d644  pam_mount-2.5.tar.xz
-f52c122bff7937a5199e3de5a99ed3f8  pam_mount-2.5.tar.xz.asc
+9f75fc8e84ea9cde619cdd6a62c7de33  pam_mount-2.13.tar.xz
+84340054e35fea9dd50feb68c99e1670  pam_mount-2.13.tar.xz.asc