Merge remote branch 'origin/master' into f13/master

This commit is contained in:
Nalin Dahyabhai 2011-01-06 12:14:01 -05:00
commit 58d9b4d42a
3 changed files with 19 additions and 4 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ slapi-nis-0.17.tar.gz
/slapi-nis-0.19.tar.gz
/slapi-nis-0.20.tar.gz
/slapi-nis-0.21.tar.gz
/slapi-nis-0.22.tar.gz

View File

@ -1,5 +1,11 @@
%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
%define ldap_impl openldap
%else
%define ldap_impl mozldap
%endif
Name: slapi-nis
Version: 0.21
Version: 0.22
Release: 1%{?dist}
Summary: NIS Server and Schema Compatibility plugins for Directory Server
Group: System Environment/Daemons
@ -7,7 +13,8 @@ License: GPLv2
URL: http://slapi-nis.fedorahosted.org/
Source0: https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: 389-ds-base-devel, mozldap-devel, tcp_wrappers-devel
BuildRequires: 389-ds-base-devel, %{ldap_impl}-devel, tcp_wrappers-devel
BuildRequires: nspr-devel, nss-devel
%description
This package provides two plugins for Red Hat and 389 Directory Server.
@ -26,7 +33,7 @@ for attributes from multiple entries in the tree.
%setup -q
%build
%configure --disable-static --with-tcp-wrappers
%configure --disable-static --with-tcp-wrappers --with-ldap=%{ldap_impl}
make %{?_smp_mflags}
%install
@ -50,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/nisserver-plugin-defs
%changelog
* Thu Jan 6 2011 Nalin Dahyabhai <nalin@redhat.com> - 0.22-1
- fix a number of scanner-uncovered defects
* Thu Jan 6 2011 Nalin Dahyabhai <nalin@redhat.com> - 0.21-2
- make sure we always pull in nss-devel and nspr-devel, and the right
ldap toolkit for the Fedora or RHEL version
* Tue Nov 18 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.21-1
- update to 0.21
- schema-compat: don't look at standalone compat containers for a search,

View File

@ -1 +1 @@
44adaca43ca62a1219597f1f238eeaeb slapi-nis-0.21.tar.gz
f72724d7c04559cb959b2e81d8bf305a slapi-nis-0.22.tar.gz