From e719fccf0ec14ef051ac150a87fd95c8aa0c6ffe Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Wed, 31 Aug 2011 13:54:38 +0200
Subject: [PATCH] Update to 1.0.0b1 (psearch + bugfixes) -
 bind-dyndb-ldap-rh727856.patch merged

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 .gitignore                     |  1 +
 bind-dyndb-ldap-rh727856.patch | 15 ---------------
 bind-dyndb-ldap.spec           | 23 +++++++++++++++--------
 sources                        |  2 +-
 4 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 bind-dyndb-ldap-rh727856.patch

diff --git a/.gitignore b/.gitignore
index 82e89a0..cc9d378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bind-dyndb-ldap-0.1.0b.tar.bz2
 /bind-dyndb-ldap-0.2.0.tar.bz2
+/bind-dyndb-ldap-1.0.0b1.tar.gz
diff --git a/bind-dyndb-ldap-rh727856.patch b/bind-dyndb-ldap-rh727856.patch
deleted file mode 100644
index a536629..0000000
--- a/bind-dyndb-ldap-rh727856.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up bind-dyndb-ldap-0.2.0/src/semaphore.c.rh727856 bind-dyndb-ldap-0.2.0/src/semaphore.c
---- bind-dyndb-ldap-0.2.0/src/semaphore.c.rh727856	2011-08-02 18:03:49.034837252 +0200
-+++ bind-dyndb-ldap-0.2.0/src/semaphore.c	2011-08-03 14:44:42.230665446 +0200
-@@ -83,9 +83,9 @@ semaphore_wait(semaphore_t *sem)
- 
- 	LOCK(&sem->mutex);
- 
--	sem->value--;
--	if (sem->value < 0)
-+	while (sem->value <= 0)
- 		WAIT(&sem->cond, &sem->mutex);
-+	sem->value--;
- 
- 	UNLOCK(&sem->mutex);
- }
diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec
index 02a5da5..20acc0f 100644
--- a/bind-dyndb-ldap.spec
+++ b/bind-dyndb-ldap.spec
@@ -1,12 +1,18 @@
+#%define PATCHVER P4
+%define PREVER b1
+#%define VERSION %{version}
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}%{PREVER}
+
 Name:           bind-dyndb-ldap
-Version:        0.2.0
-Release:        4%{?dist}
+Version:        1.0.0
+Release:        0.1.%{PREVER}%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            https://fedorahosted.org/bind-dyndb-ldap
-Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
+Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bind-devel >= 32:9.6.1-0.3.b1
@@ -15,8 +21,6 @@ BuildRequires:  openldap-devel
 
 Requires:       bind >= 32:9.6.1-0.3.b1
 
-Patch0:bind-dyndb-ldap-rh727856.patch
-
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
 support for dynamic updates and internal caching, to lift the load
@@ -24,8 +28,7 @@ off of your LDAP server.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .rh727856
+%setup -q -n %{name}-%{VERSION}
 
 %build
 export CFLAGS="`isc-config.sh --cflags dns` $RPM_OPT_FLAGS"
@@ -48,11 +51,15 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING doc/{example.ldif,schema}
+%doc NEWS README COPYING doc/{example.ldif,schema}
 %{_libdir}/bind/ldap.so
 
 
 %changelog
+* Wed Aug 31 2011 Adam Tkac <atkac redhat com> - 1.0.0-0.1.b1
+- update to 1.0.0b1 (psearch + bugfixes)
+- bind-dyndb-ldap-rh727856.patch merged
+
 * Wed Aug 03 2011 Adam Tkac <atkac redhat com> - 0.2.0-4
 - fix race condition in semaphore_wait (#727856)
 
diff --git a/sources b/sources
index 3242852..d92a1a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8e81201819d0d6897f5967a8787f783  bind-dyndb-ldap-0.2.0.tar.bz2
+e051a4e4c0e5c88fba45181fa23fc15f  bind-dyndb-ldap-1.0.0b1.tar.gz