[pam_mount] - Update to lastest release - Update libHX dependency - remove upstreamed patches - do not package p

[Till Maas]

commit 4264763fecdeee88a0f91ab52c9e4095cb6d995b
Author: Till Maas <opensource at till.name>
Date:   Mon Aug 16 22:26:33 2010 +0200

    - Update to lastest release
    - Update libHX dependency
    - remove upstreamed patches
    - do not package pam_mount.txt (RH #615714)

 .gitignore                             |    2 ++
 pam_mount-2.4-man-db.patch             |   12 ------------
 pam_mount-2.4-selinux-cryptmount.patch |   22 ----------------------
 pam_mount.spec                         |   31 +++++++++++++------------------
 sources                                |    4 ++--
 5 files changed, 17 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 985aa0d..938322b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 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
diff --git a/pam_mount.spec b/pam_mount.spec
index 915d97d..55b547c 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -1,8 +1,8 @@
 %global packext xz
 
 Name:           pam_mount
-Version:        2.4
-Release:        2%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
@@ -18,30 +18,21 @@ Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.ta
 # Not upstreamable.
 Patch0:         pam_mount-2.4-cmtab_location.patch
 # Use mount -t crypt instead of mount.crypt as cryptmount command to support selinux
-# Merged into pam_mount 2.4:
-# http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount/pam-mount;a=commitdiff;h=458b7245f3efd2cfaafc73cd721a6e26eabfb428
-Patch1:         pam_mount-2.4-selinux-cryptmount.patch
 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.4
+BuildRequires:  libHX-devel >= 3.5
 %if %packext == lz
 BuildRequires:  lzip
 %endif
 Requires:       pam
-Requires:       libHX >= 3.4
+Requires:       libHX >= 3.5
 Requires:       cryptsetup-luks-libs >= 1.1.2
 %if (0%{?fedora} >= 14)
 BuildRequires:  man-db
-%else
-# used for Patch100 / col -b
-BuildRequires:  util-linux-ng
 %endif
-# use man ... | col -b instead of man -l ..., because man -l is only supported my man -db
-# Not suitable for upstream
-Patch100:       pam_mount-2.4-man-db.patch
 
 
 # Used in mtcrypt.c / mount.crypt
@@ -83,10 +74,6 @@ lzip -c -d %SOURCE0 | tar -xvvf - -C ..
 %endif
 
 %patch0 -p1 -b .cmtab_location
-%patch1 -p1 -b .selinux-cryptmount
-%if ! (0%{?fedora} >= 14)
-%patch100 -p1 -b .man-db
-%endif
 
 
 %build
@@ -118,7 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/pam_mount.txt doc/todo.txt
+%doc doc/bugs.txt doc/changelog.txt doc/faq.txt doc/options.txt doc/todo.txt
+# generated from manpage, no need to package it twice:
+#doc/pam_mount.txt
 %doc config/pam_mount.conf.xml
 %doc LICENSE.GPL2 LICENSE.GPL3
 %doc LICENSE.LGPL2 LICENSE.LGPL3
@@ -153,6 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 16 2010 Till Maas <opensource at till.name> - 2.5-1
+- Update to lastest release
+- Update libHX dependency
+- remove upstreamed patches
+- do not package pam_mount.txt (RH #615714)
+
 * Sat Jul 03 2010 Till Maas <opensource at till.name> - 2.4-2
 - Add cryptsetup-luks-libs Requires
 - list all manpages explicitly
diff --git a/sources b/sources
index cdc1fa8..79fb9ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e7788d69ff7bc7e6957ae3fbf894b06c  pam_mount-2.4.tar.xz
-609da5cbaa7aee8147d40a5df216f957  pam_mount-2.4.tar.xz.asc
+f005ac284ebbd600f8eb2a729da1d644  pam_mount-2.5.tar.xz
+f52c122bff7937a5199e3de5a99ed3f8  pam_mount-2.5.tar.xz.asc