Simo Sorce wrote:
On Wed, 12 Jan 2011 16:40:17 -0500
Rob Crittenden<[email protected]> wrote:
We now build using just openldap so drop the build dependency on
mozldap.
rob
Nack,
you forgot the configure.ac change
Simo.
It was in patch 674. Redid both of them, updated patch attached.
rob
>From 0e58f489225adcb4a9abd187099bf49079c8ccc5 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <[email protected]>
Date: Wed, 12 Jan 2011 17:14:06 -0500
Subject: [PATCH] Drop dependency on mozldap
---
daemons/configure.ac | 7 -------
ipa.spec.in | 6 ++++--
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/daemons/configure.ac b/daemons/configure.ac
index 370c5d6..72ff750 100644
--- a/daemons/configure.ac
+++ b/daemons/configure.ac
@@ -151,13 +151,6 @@ if test "x$ac_cv_header_svrcore_svrcore_h" = "yes" ; then
CPPFLAGS="$CPPFLAGS -I/usr/include/svrcore"
fi
-CPPFLAGS=$SAVE_CPPFLAGS
-AC_CHECK_HEADER(mozldap/ldap.h)
-if test "x$ac_cv_header_mozldap_ldap_h" = "xno" ; then
- AC_MSG_ERROR([Required MOZLDAP header not available (mozldap-devel)])
-fi
-PKG_CHECK_MODULES(MOZLDAP, mozldap > 6)
-
AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
dnl Check for other libraries we need to link with to get the main routines.
test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
diff --git a/ipa.spec.in b/ipa.spec.in
index 5c3dd09..2d6eda2 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -24,7 +24,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{ONLY_CLIENT}
BuildRequires: 389-ds-base-devel >= 1.2.7.4
-BuildRequires: mozldap-devel
BuildRequires: svrcore-devel
BuildRequires: nspr-devel
BuildRequires: openssl-devel
@@ -229,7 +228,7 @@ export CPPFLAGS="$CPPFLAGS %{optflags}"
make version-update
cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%if ! %{ONLY_CLIENT}
-%if 0%{?fedora} >= 14
+%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap; cd ..
%else
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
@@ -515,6 +514,9 @@ fi
%endif
%changelog
+* Wed Jan 12 2011 Rob Crittenden <[email protected]> - 1.99-36
+- Drop BuildRequires on mozldap-devel
+
* Mon Dec 13 2010 Rob Crittenden <[email protected]> - 1.99-35
- Add Requires on krb5-pkinit-openssl
--
1.7.3.4
_______________________________________________
Freeipa-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel
