summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--configure.ac2
-rw-r--r--slapi-nis.spec15
3 files changed, 16 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 64a26ea..c9836bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+0.37 * Fix a compile error on systems which don't define
+ LDAP_SCOPE_SUBORDINATE, reported by Christian Neuhold.
0.36 * Stop yp_first/yp_next from looping indefinitely when keys get
duplicated in NIS maps, at least for a single LDAP entry.
0.35 * Add mmatch,mregmatch[i],mregsub[i] functions (part of #783274),
diff --git a/configure.ac b/configure.ac
index 9aea1e3..5ae2c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(slapi-nis,0.36)
+AC_INIT(slapi-nis,0.37)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE(foreign)
LT_INIT([disable-static])
diff --git a/slapi-nis.spec b/slapi-nis.spec
index c7844af..8ccc62f 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -5,7 +5,7 @@
%endif
Name: slapi-nis
-Version: 0.36
+Version: 0.37
Release: 1%{?dist}
Summary: NIS Server and Schema Compatibility plugins for Directory Server
Group: System Environment/Daemons
@@ -14,8 +14,13 @@ URL: http://slapi-nis.fedorahosted.org/
Source0: https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
#Source1: https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 389-ds-base-devel, %{ldap_impl}-devel, tcp_wrappers-devel
+BuildRequires: 389-ds-base-devel, %{ldap_impl}-devel
BuildRequires: nspr-devel, nss-devel, /usr/bin/rpcgen
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+BuildRequires: tcp_wrappers-devel
+%else
+BuildRequires: tcp_wrappers
+%endif
%if 0%{?fedora} > 14 || 0%{?rhel} > 6
BuildRequires: libtirpc-devel
%endif
@@ -65,6 +70,12 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/nisserver-plugin-defs
%changelog
+* Mon Feb 13 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.37-1
+- fix a compile error on systems where LDAP_SCOPE_SUBORDINATE isn't defined
+ (reported by Christian Neuhold)
+- conditionalize whether we have a build dependency on tcp_wrappers (older
+ releases) or tcp_wrappers-devel (newer releases)
+
* Tue Jan 24 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.36-1
- take steps to avoid making yp_first/yp_next clients loop indefinitely
when a single LDAP entry produces multiple copies of the same NIS key