From d47351c199d2fb5147687ddac660e03a8e8044b6 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Aug 12 2011 20:05:01 +0000
Subject: - tag 0.26


---

diff --git a/NEWS b/NEWS
index de57065..1c3ebdd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+0.26    * Switch to libpthread rwlocks instead of NSPR rwlocks (part of
+          #730394/730403).
 0.25    * Speed up building compat entries when they refer to thousands of
 	  other entries (#694623).
 0.24    * Buidl with either glibc's RPC or libtirpc.
diff --git a/configure.ac b/configure.ac
index 25217c9..d91b16f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(slapi-nis,0.25)
+AC_INIT(slapi-nis,0.26)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE(foreign)
 LT_INIT
@@ -97,7 +97,7 @@ dirsrv)
 	CFLAGS="$saved_CFLAGS"
 	LIBS="$saved_LIBS"
 	thread_api=NSPR
-	thread_lock_api=NSPR
+	thread_lock_api=POSIX
 	;;
 *)
 	RUNTIME_CFLAGS=
diff --git a/slapi-nis.spec b/slapi-nis.spec
index eea46e8..c739715 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:		slapi-nis
-Version:	0.25
+Version:	0.26
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Fri Aug 12 2011 Nalin Dahyabhai <nalin@redhat.com> - 0.26-1
+- when building for 389-ds, use libpthread's read-write locks instead of
+  NSPR's (#730403)
+
 * Wed Jul 27 2011 Nalin Dahyabhai <nalin@redhat.com> - 0.25-1
 - speed up building compat entries which reference thousands of other entries
   (#694623)