packages: openldap/openldap.spec - replaced smbk5pwd and nssov build hacks ...

[baggins]

Author: baggins                      Date: Mon Mar 28 19:11:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- replaced smbk5pwd and nssov build hacks with generic solution
- added unresolved symbols check for slapd modules

---- Files affected:
packages/openldap:
   openldap.spec (1.347 -> 1.348) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.347 packages/openldap/openldap.spec:1.348
--- packages/openldap/openldap.spec:1.347	Mon Mar 28 17:39:39 2011
+++ packages/openldap/openldap.spec	Mon Mar 28 21:11:51 2011
@@ -61,8 +61,8 @@
 Patch14:	%{name}-pie.patch
 Patch15:	%{name}-gethostbyXXXX_r.patch
 Patch16:	%{name}-smbk5pwd-shadowLastChange.patch
-Patch17:	%{name}-smbk5pwd.patch
-Patch18:	%{name}-smbk5pwd-heimdal.patch
+Patch17:	%{name}-contrib-modules.patch
+Patch18:	%{name}-contrib-krb5.patch
 # Patch for the evolution library
 Patch100:	%{name}-ntlm.diff
 URL:		http://www.openldap.org/
@@ -943,13 +943,10 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p0
-%if %{with krb5}
 %patch17 -p1
-%else
+%if %{with krb5}
 %patch18 -p1
 %endif
-
-ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays/smbk5pwd.c
 cd ..
 
 %if %{without system_db}
@@ -1079,12 +1076,7 @@
 
 %{__make} -j1 depend
 %{__make}
-
-%{__make} -j1 -C contrib/slapd-modules/nssov \
-	libdir=%{_libdir}/openldap \
-	CC="%{__cc}" \
-	OPT="%{rpmcflags} %{rpmldflags} -L../../../libraries/libldap_r" \
-	nssov.la
+%{__make} -C contrib/slapd-modules
 
 install -d libs
 for d in liblber libldap libldap_r ; do
@@ -1191,14 +1183,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C contrib/slapd-modules/nssov install \
-	moduledir=%{_libdir}/openldap \
-	schemadir=%{schemadir} \
+%{__make} -C contrib/slapd-modules install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install contrib/slapd-modules/nssov/slapo-nssov.5 $RPM_BUILD_ROOT%{_mandir}/man5
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/openldap/*.a
 %{!?with_ndb:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/slapd-ndb.5}
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
@@ -1243,6 +1230,14 @@
   rm $RPM_BUILD_ROOT%{_includedir}/%{name}/$(basename $I)
 done
 
+# check for undefined symbols in slapd modules
+for i in $RPM_BUILD_ROOT%{_libdir}/openldap/*.so ; do
+	if LD_PRELOAD=$RPM_BUILD_ROOT%{_libdir}/liblber-2.4.so.2:$RPM_BUILD_ROOT%{_libdir}/libldap_r-2.4.so.2:%{!?with_system_db:$RPM_BUILD_ROOT%{_libdir}/libslapd_db-4.6.so:}$RPM_BUILD_ROOT%{_sbindir}/slapd ldd -r $i 2>&1 | grep "undefined symbol"; then
+		echo "Undefined symbols found in" $i
+		exit 1
+	fi
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1857,6 +1852,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.348  2011/03/28 19:11:51  baggins
+- replaced smbk5pwd and nssov build hacks with generic solution
+- added unresolved symbols check for slapd modules
+
 Revision 1.347  2011/03/28 15:39:39  baggins
 - reordered patches
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.347&r2=1.348&f=u