rpms/pam_mount/devel pam_mount-2.4-man-db.patch, NONE, 1.1 pam_mount.spec, 1.69, 1.70

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25668

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-2.4-man-db.patch 
Log Message:
* Fri Jul 02 2010 Till Maas <opensource at till.name> - 2.4-1
- Update to new release
- add patch to keep cmtab at /etc
- add patch to use mount -t crypt instead of mount.crypt for crypto volumes
- BR cryptsetup-luks-devel >= 1.1.2
- add man-db BR for Fedora >= 14 for pam_mount.8 to pam_mount.txt conversion
- add Patch to remove man-db BR for Fedora < 14


pam_mount-2.4-man-db.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam_mount-2.4-man-db.patch ---
diff -up pam_mount-2.4/doc/Makefile.in.man-db pam_mount-2.4/doc/Makefile.in
--- pam_mount-2.4/doc/Makefile.in.man-db	2010-07-02 19:56:21.143982254 +0200
+++ pam_mount-2.4/doc/Makefile.in	2010-07-02 19:57:52.140985730 +0200
@@ -551,7 +551,7 @@ pam_mount.conf.5: pam_mount.conf.5.in ${
 	${AM_V_GEN}${replcmd} ${srcdir}/pam_mount.conf.5.in >pam_mount.conf.5;
 
 pam_mount.txt: pam_mount.8
-	${AM_V_GEN}man -l pam_mount.8 | perl -pe 's/.\cH//g' >pam_mount.txt;
+	${AM_V_GEN}man pam_mount.8 | col -b | perl -pe 's/.\cH//g' >pam_mount.txt;
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- pam_mount.spec	2 Jul 2010 17:32:38 -0000	1.69
+++ pam_mount.spec	2 Jul 2010 19:17:22 -0000	1.70
@@ -34,7 +34,13 @@ Requires:       pam
 Requires:       libHX >= 3.4
 %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
@@ -77,6 +83,9 @@ lzip -c -d %SOURCE0 | tar -xvvf - -C ..
 
 %patch0 -p1 -b .cmtab_location
 %patch1 -p1 -b .selinux-cryptmount
+%if ! (0%{?fedora} >= 14)
+%patch100 -p1 -b .man-db
+%endif
 
 
 %build
@@ -139,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 - add patch to use mount -t crypt instead of mount.crypt for crypto volumes
 - BR cryptsetup-luks-devel >= 1.1.2
 - add man-db BR for Fedora >= 14 for pam_mount.8 to pam_mount.txt conversion
+- add Patch to remove man-db BR for Fedora < 14
 
 * Wed May 19 2010 Till Maas <opensource at till.name> - 2.3-1
 - Update to new release