rpms/pam_krb5/devel pam_krb5-nopath.patch, NONE, 1.1.2.1 pam_krb5.spec, 1.40, 1.40.2.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Mar 9 00:28:04 UTC 2006


Author: notting

Update of /cvs/dist/rpms/pam_krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16872

Modified Files:
      Tag: pam_krb5-2_2_6-2
	pam_krb5.spec 
Added Files:
      Tag: pam_krb5-2_2_6-2
	pam_krb5-nopath.patch 
Log Message:
don't use paths in man pages - causes multilib conflicts


pam_krb5-nopath.patch:
 pam_krb5.8             |    8 ++++----
 pam_krb5.8.in          |    8 ++++----
 pam_krb5_storetmp.8    |    4 ++--
 pam_krb5_storetmp.8.in |    4 ++--
 pam_newpag.8           |    4 ++--
 pam_newpag.8.in        |    4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE pam_krb5-nopath.patch ---
--- pam_krb5-2.2.7-1/src/pam_krb5.8.in.foo	2006-03-08 19:06:48.000000000 -0500
+++ pam_krb5-2.2.7-1/src/pam_krb5.8.in	2006-03-08 19:06:58.000000000 -0500
@@ -4,13 +4,13 @@
 pam_krb5 \- Kerberos 5 authentication
 
 .SH SYNOPSIS
-.B auth required @SECURITYDIR@/pam_krb5.so
+.B auth required pam_krb5.so
 .br
-.B session optional @SECURITYDIR@/pam_krb5.so
+.B session optional pam_krb5.so
 .br
-.B account sufficient @SECURITYDIR@/pam_krb5.so
+.B account sufficient pam_krb5.so
 .br
-.B password sufficient @SECURITYDIR@/pam_krb5.so
+.B password sufficient pam_krb5.so
 
 .SH DESCRIPTION
 The pam_krb5.so module is designed to allow smooth integration of Kerberos 5
--- pam_krb5-2.2.7-1/src/pam_krb5_storetmp.8.foo	2006-03-08 19:10:30.000000000 -0500
+++ pam_krb5-2.2.7-1/src/pam_krb5_storetmp.8	2006-03-08 19:10:43.000000000 -0500
@@ -1,7 +1,7 @@
 .TH pam_krb5_storetmp 8 2005/10/05 "Red Hat Linux" "System Administrator's Manual"
 
 .SH NAME
-/lib/security/pam_krb5/pam_krb5_storetmp \- Temporary file helper
+pam_krb5_storetmp \- Temporary file helper
 
 .SH SYNOPSIS
 .B pam_krb5_storetmp pattern [uid] [gid]
@@ -29,7 +29,7 @@
 creating the file.  The helper continues in its task if the attempt fails.
 
 .SH FILES
-\fI/lib/security/pam_krb5.so\fR
+\fIpam_krb5.so\fR
 .br
 
 .SH "SEE ALSO"
--- pam_krb5-2.2.7-1/src/pam_krb5_storetmp.8.in.foo	2006-03-08 19:06:58.000000000 -0500
+++ pam_krb5-2.2.7-1/src/pam_krb5_storetmp.8.in	2006-03-08 19:07:26.000000000 -0500
@@ -1,7 +1,7 @@
 .TH pam_krb5_storetmp 8 2005/10/05 "Red Hat Linux" "System Administrator's Manual"
 
 .SH NAME
- at SECURITYDIR@/@PACKAGE@/pam_krb5_storetmp \- Temporary file helper
+pam_krb5_storetmp \- Temporary file helper
 
 .SH SYNOPSIS
 .B pam_krb5_storetmp pattern [uid] [gid]
@@ -29,7 +29,7 @@
 creating the file.  The helper continues in its task if the attempt fails.
 
 .SH FILES
-\fI at SECURITYDIR@/pam_krb5.so\fR
+\fIpam_krb5.so\fR
 .br
 
 .SH "SEE ALSO"
--- pam_krb5-2.2.7-1/src/pam_newpag.8.in.foo	2006-03-08 19:07:27.000000000 -0500
+++ pam_krb5-2.2.7-1/src/pam_newpag.8.in	2006-03-08 19:07:37.000000000 -0500
@@ -4,9 +4,9 @@
 pam_newpag \- create a new process authentication group
 
 .SH SYNOPSIS
-.B auth optional @SECURITYDIR@/pam_newpag.so
+.B auth optional pam_newpag.so
 .br
-.B session optional @SECURITYDIR@/pam_newpag.so
+.B session optional pam_newpag.so
 
 .SH DESCRIPTION
 The pam_newpag.so module's sole purpose is to provide a workaround for
--- pam_krb5-2.2.7-1/src/pam_newpag.8.foo	2006-03-08 19:10:43.000000000 -0500
+++ pam_krb5-2.2.7-1/src/pam_newpag.8	2006-03-08 19:10:49.000000000 -0500
@@ -4,9 +4,9 @@
 pam_newpag \- create a new process authentication group
 
 .SH SYNOPSIS
-.B auth optional /lib/security/pam_newpag.so
+.B auth optional pam_newpag.so
 .br
-.B session optional /lib/security/pam_newpag.so
+.B session optional pam_newpag.so
 
 .SH DESCRIPTION
 The pam_newpag.so module's sole purpose is to provide a workaround for
--- pam_krb5-2.2.7-1/src/pam_krb5.8.foo	2006-03-08 19:08:00.000000000 -0500
+++ pam_krb5-2.2.7-1/src/pam_krb5.8	2006-03-08 19:10:29.000000000 -0500
@@ -4,13 +4,13 @@
 pam_krb5 \- Kerberos 5 authentication
 
 .SH SYNOPSIS
-.B auth required /lib/security/pam_krb5.so
+.B auth required pam_krb5.so
 .br
-.B session optional /lib/security/pam_krb5.so
+.B session optional pam_krb5.so
 .br
-.B account sufficient /lib/security/pam_krb5.so
+.B account sufficient pam_krb5.so
 .br
-.B password sufficient /lib/security/pam_krb5.so
+.B password sufficient pam_krb5.so
 
 .SH DESCRIPTION
 The pam_krb5.so module is designed to allow smooth integration of Kerberos 5


Index: pam_krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_krb5/devel/pam_krb5.spec,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -r1.40 -r1.40.2.1
--- pam_krb5.spec	13 Feb 2006 12:50:28 -0000	1.40
+++ pam_krb5.spec	9 Mar 2006 00:28:01 -0000	1.40.2.1
@@ -1,12 +1,13 @@
 Summary: A Pluggable Authentication Module for Kerberos 5.
 Name: pam_krb5
 Version: 2.2.6
-Release: 2
-Source0: pam_krb5-%{version}-%{release}.tar.gz
+Release: 2.1
+Source0: pam_krb5-%{version}-2.tar.gz
 License: LGPL
 Group: System Environment/Base
 BuildPrereq: byacc, flex, krb5-devel, pam-devel
 BuildRoot: %{_tmppath}/%{name}-root
+Patch: pam_krb5-nopath.patch
 
 %description 
 This is pam_krb5, a pluggable authentication module that can be used with
@@ -15,7 +16,8 @@
 The included pam_krb5afs module also gets AFS tokens if so configured.
 
 %prep
-%setup -q -n pam_krb5-%{version}-%{release}
+%setup -q -n pam_krb5-%{version}-2
+%patch -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -44,6 +46,9 @@
 
 # $Id$
 %changelog
+* Wed Mar  8 2006 Bill Nottingham <notting at redhat.com> - 2.2.6-2.1
+- don't use paths in man pages - avoids multilib conflicts
+
 * Mon Feb 13 2006 Nalin Dahyabhai <nalin at redhat.com> - 2.2.6-2
 - rebuild
 




More information about the fedora-cvs-commits mailing list