From a7f763871f6a6aeb88df22cbb7387d672266135e Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 13 Feb 2012 10:52:07 -0500 Subject: [PATCH] - 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) --- .gitignore | 2 ++ slapi-nis.spec | 15 +++++++++++++-- sources | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f15e25e..8d76190 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ slapi-nis-0.17.tar.gz /slapi-nis-0.34.tar.gz.sig /slapi-nis-0.36.tar.gz /slapi-nis-0.36.tar.gz.sig +/slapi-nis-0.37.tar.gz +/slapi-nis-0.37.tar.gz.sig diff --git a/slapi-nis.spec b/slapi-nis.spec index db1c233..7a6773d 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 - 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 - 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 diff --git a/sources b/sources index fbbc43a..8a4034e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dccfd103ec12affa43e92b74c025e20d slapi-nis-0.36.tar.gz -f18dd0893041681972528ebd66545aee slapi-nis-0.36.tar.gz.sig +1888e224929a3751029a1352f67694b0 slapi-nis-0.37.tar.gz +d6cef0864fa589f58aba2b9242aa2449 slapi-nis-0.37.tar.gz.sig