Index: trunk/server/fedora/specs/nss-ldapd.spec.patch
===================================================================
--- trunk/server/fedora/specs/nss-ldapd.spec.patch	(revision 1272)
+++ trunk/server/fedora/specs/nss-ldapd.spec.patch	(revision 1273)
@@ -1,5 +1,5 @@
---- nss-ldapd.spec.orig	2009-03-30 04:33:50.000000000 -0400
-+++ nss-ldapd.spec	2009-06-03 03:18:49.000000000 -0400
-@@ -19,18 +19,19 @@
+--- nss-ldapd.spec.orig
++++ nss-ldapd.spec
+@@ -19,20 +19,20 @@
  
  
@@ -7,5 +7,4 @@
 -BuildRequires:  db-devel krb5-devel openldap2-devel
 +BuildRequires:  db4-devel krb5-devel openldap-devel autoconf automake libtool
-+Conflicts:      nss_ldap
  License:        LGPL v2.1 or later
  Group:          Productivity/Networking/LDAP/Clients
@@ -13,25 +12,29 @@
  PreReq:         /bin/chmod
  Conflicts:      nss_ldap
- Version:        0.6.8
--Release:        2.1
-+Release:        2.1.scripts.%{scriptsversion}
+ Version:        0.6.10
+-Release:        6.2
++Release:        6.2.scripts.%{scriptsversion}
  Summary:        NSS module and daemon for using LDAP as a naming service
- Url:            http://ch.tudelft.nl/~arthur/nss-ldapd/
+ Url:            http://arthurdejong.org/nss-ldapd/
  Source:         nss-ldapd-%{version}.tar.bz2
 -Source1:        rc.nslcd
+ Source100:      nss-ldapd-0.6.8-rpmlintrc
+ Patch0:         nslcd-passwd-offbyone.dif
 +Patch1000:      rc.nslcd.patch
- Source100:      nss-ldapd-0.6.8-rpmlintrc
  BuildRoot:      %{_tmppath}/%{name}-%{version}-build
  
-@@ -52,7 +53,7 @@
+ %description
+@@ -53,8 +53,8 @@
  
  %prep
  %setup -q
 -cp -v %{S:1} .
+-%patch -p1
++%patch0 -p1
 +%patch1000 -p0 -b .rc
  
  %build
  %{?suse_update_config:%{suse_update_config -f}}
-@@ -72,7 +73,6 @@
+@@ -71,7 +71,6 @@
  mkdir -p $RPM_BUILD_ROOT/etc/init.d/
  mkdir -p $RPM_BUILD_ROOT/usr/sbin/
@@ -41,5 +44,5 @@
  mkdir -p $RPM_BUILD_ROOT/var/run/nslcd
  install -m 644 man/nss-ldapd.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5
-@@ -88,13 +88,8 @@
+@@ -87,13 +86,8 @@
      /bin/chmod 640 /etc/nss-ldapd.conf
  fi
@@ -55,5 +58,5 @@
  %files
  %defattr(-,root,root)
-@@ -104,7 +99,6 @@
+@@ -103,7 +97,6 @@
  %doc %{_mandir}/man8/*
  %config(noreplace) %attr(640,root,root) /etc/nss-ldapd.conf
@@ -63,5 +66,5 @@
  /usr/sbin/nslcd
  
-@@ -129,6 +123,10 @@
+@@ -151,6 +144,10 @@
  - Adjust config file permissions upon update, to fix world-readable
    /etc/nss-ldapd.conf as created by older versions