rpms/nfs-utils-lib/F-7 nfs-utils-lib-1.0.8-idmap.conf.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 nfs-utils-lib.spec, 1.19, 1.20 sources, 1.5, 1.6

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7581

Modified Files:
	.cvsignore nfs-utils-lib.spec sources 
Added Files:
	nfs-utils-lib-1.0.8-idmap.conf.patch 
Log Message:
- Updated libnfsidmap to the 0.20 release
- Added rules to install/remove /etc/idmap.conf


nfs-utils-lib-1.0.8-idmap.conf.patch:

--- NEW FILE nfs-utils-lib-1.0.8-idmap.conf.patch ---
--- nfs-utils-lib-1.0.8/libnfsidmap/idmapd.conf.orig	2006-08-14 17:19:45.000000000 -0400
+++ nfs-utils-lib-1.0.8/libnfsidmap/idmapd.conf	2007-07-14 08:26:06.000000000 -0400
@@ -1,29 +1,29 @@
 [General]
 #Verbosity = 0
 # The following should be set to the local NFSv4 domain name (REQUIRED)
-Domain = local.domain.edu
+Domain = localdomain
 
 [Mapping]
 
-#Nobody-User = nobody
-#Nobody-Group = nobody
+Nobody-User = nobody
+Nobody-Group = nobody
 
 [Translation]
 
 # Translation method is either "nsswitch" (DEFAULT) or "umich_ldap"
-#Method = nsswitch
+Method = nsswitch
 
 #-------------------------------------------------------------------#
 # The following are only used if Translation Method is umich_ldap.
 #-------------------------------------------------------------------#
 
-[UMICH_SCHEMA]
+#[UMICH_SCHEMA]
 
 # server information (REQUIRED)
-LDAP_server = ldap-server.local.domain.edu
+#LDAP_server = ldap-server.local.domain.edu
 
 # the default search base (REQUIRED)
-LDAP_base = dc=local,dc=domain,dc=edu
+#LDAP_base = dc=local,dc=domain,dc=edu
 
 #-----------------------------------------------------------#
 # The remaining options have defaults (as shown)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Feb 2007 19:35:57 -0000	1.5
+++ .cvsignore	16 Jul 2007 14:22:55 -0000	1.6
@@ -4,3 +4,4 @@
 libnfsidmap-0.16.tar.gz
 librpcsecgss-0.14.tar.gz
 libnfsidmap-0.19.tar.gz
+libnfsidmap-0.20.tar.gz


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-7/nfs-utils-lib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nfs-utils-lib.spec	12 Mar 2007 19:10:28 -0000	1.19
+++ nfs-utils-lib.spec	16 Jul 2007 14:22:55 -0000	1.20
@@ -1,11 +1,11 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
-%define idmapvers 0.19
+%define idmapvers 0.20
 %define libnfsidmap libnfsidmap
 %define rpcsecgssvers 0.14
 %define librpcsecgss librpcsecgss
@@ -13,15 +13,17 @@
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidmap}-%{idmapvers}.tar.gz
 Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz
 
-Patch0: librpcsecgss-0.13-compile.patch
+Patch00: nfs-utils-lib-1.0.8-idmap.conf.patch
+
+Patch100: librpcsecgss-0.13-compile.patch
 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext, autoconf, automake
-BuildRequires: libgssapi-devel >= 0.10, openldap-devel
+BuildRequires: libgssapi-devel >= 0.11, openldap-devel
 Requires(postun): /sbin/ldconfig
 Requires(pre): /sbin/ldconfig
-Requires: libgssapi >= 0.10, openldap
+Requires: libgssapi >= 0.11, openldap
 
 %description
 Support libraries that are needed by the commands and 
@@ -42,8 +44,9 @@
 mv %{libnfsidmap}-%{idmapvers} %{libnfsidmap}
 mv %{librpcsecgss}-%{rpcsecgssvers} %{librpcsecgss}
 
-%patch -p1
+%patch00 -p1
 
+%patch100 -p1
 %build
 top=`pwd`
 for dir in %{libs} ; do
@@ -79,6 +82,8 @@
 	done
 	popd
 done
+mkdir -p %{buildroot}/etc
+install -m 644 %{libnfsidmap}/idmapd.conf $RPM_BUILD_ROOT/etc/idmapd.conf
 
 %post -p /sbin/ldconfig
 
@@ -98,6 +103,7 @@
 %{_defaultdocdir}/%{librpcsecgss}/README
 %{_libdir}/pkgconfig/librpcsecgss.pc
 
+%config(noreplace) /etc/idmapd.conf
 %{_libdir}/libnfsidmap.so.*
 %{_libdir}/libnfsidmap.la
 %{_defaultdocdir}/%{libnfsidmap}/AUTHORS
@@ -122,7 +128,11 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
-* Mon Mar 12 2007  Steve Dickson <steved at redhat.com> 1.0.8-9
+* Mon Jul 16 2007 Steve Dickson <steved at redhat.com> 1.0.8-10
+- Updated libnfsidmap to the 0.20 release
+- Added rules to install/remove /etc/idmap.conf
+
+* Mon Mar 12 2007 Steve Dickson <steved at redhat.com> 1.0.8-9
 - Removed the --prefix=$RPM_BUILD_ROOT from the %%configure (bz 213152)
 
 * Tue Feb 20 2007 Steve Dickson <steved at redhat.com> 1.0.8-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Feb 2007 19:35:57 -0000	1.5
+++ sources	16 Jul 2007 14:22:55 -0000	1.6
@@ -1,2 +1,2 @@
 0d4cdee46a98731b1b71e30504589281  librpcsecgss-0.14.tar.gz
-9c2eb85fc8ff533d8b05d37651a30c9d  libnfsidmap-0.19.tar.gz
+9233cb77876eb642374a0d2bcaba1170  libnfsidmap-0.20.tar.gz