From 1a0d6b505a385736e9af5fad6a1639129550f0e4 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mar 01 2005 23:25:29 +0000 Subject: add missing source file --- diff --git a/openldap.spec b/openldap.spec index 2c1dc1c..63b7d11 100644 --- a/openldap.spec +++ b/openldap.spec @@ -13,6 +13,7 @@ # For Fedora, we want 2.1 compatibility. For RHEL or RHL9, we may want 2.0. %define compat_version %{version_21} %define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64 +%define nss_ldap_build 0 Summary: The configuration files, libraries, and documentation for OpenLDAP. Name: openldap @@ -34,6 +35,7 @@ Source11: README.upgrading Source12: http://www.OpenLDAP.org/doc/admin/guide.html Source13: nptl-abi-note.S Source14: README.evolution +Source15: README.nss_ldap Patch0: openldap-2.2.15-config.patch Patch2: openldap-1.2.11-cldap.patch Patch4: openldap-2.0.11-ldaprc.patch @@ -168,6 +170,7 @@ fi pushd evo-openldap-%{version_22} %patch40 -p0 -b .evolution-ntlm popd +%if %{nss_ldap_build} # Set up a build tree for a static version of libldap with async start_tls # support, which nss_ldap can use to avoid blocking if a server is accepting # connections but is otherwise unresponsive. @@ -178,6 +181,7 @@ fi pushd nss_ldap-openldap-%{version_22} %patch41 -p0 -b .start_tls popd +%endif pushd MigrationTools-%{migtools_version} %patch21 -p1 -b .instdir @@ -394,6 +398,7 @@ build \ --includedir=%{evolution_connector_includedir} \ --libdir=%{evolution_connector_libdir} popd +%if %{nss_ldap_build} # Build nss_ldap-specific clients just as we would normal clients, except with # a different installation directory in mind and no shared libraries. pushd nss_ldap-openldap-%{version_22} @@ -409,6 +414,7 @@ build \ --includedir=%{nss_ldap_includedir} \ --libdir=%{nss_ldap_libdir} popd +%endif %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -471,6 +477,7 @@ install -m644 \ $RPM_SOURCE_DIR/README.evolution \ $RPM_BUILD_ROOT/%{evolution_connector_prefix}/ popd +%if %{nss_ldap_build} pushd nss_ldap-openldap-%{version_22} make install DESTDIR=$RPM_BUILD_ROOT \ includedir=%{nss_ldap_includedir} \ @@ -480,6 +487,7 @@ install -m644 \ $RPM_SOURCE_DIR/README.nss_ldap \ $RPM_BUILD_ROOT/%{nss_ldap_prefix}/ popd +%endif pushd openldap-%{version_22}/build-clients make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" popd @@ -531,8 +539,10 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/openldap/migration/*.{instdir,simple,schema,mk rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.so* +%if %{nss_ldap_build} rm -f $RPM_BUILD_ROOT/%{nss_ldap_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{nss_ldap_libdir}/*.so* +%endif rm -f $RPM_BUILD_ROOT/%{_sbindir}/openldap/*.a rm -f $RPM_BUILD_ROOT/%{_sbindir}/openldap/*.so @@ -678,17 +688,18 @@ fi %attr(0644,root,root) %{evolution_connector_includedir}/*.h %attr(0755,root,root) %dir %{evolution_connector_libdir} %attr(0644,root,root) %{evolution_connector_libdir}/*.a +%if %{nss_ldap_build} %attr(0755,root,root) %dir %{nss_ldap_prefix} %attr(0644,root,root) %{nss_ldap_prefix}/README* %attr(0755,root,root) %dir %{nss_ldap_includedir} %attr(0644,root,root) %{nss_ldap_includedir}/*.h %attr(0755,root,root) %dir %{nss_ldap_libdir} %attr(0644,root,root) %{nss_ldap_libdir}/*.a +%endif %changelog * Tue Mar 1 2005 Nalin Dahyabhai 2.2.23-3 - add bind-libbind-devel and libtool-ltdl-devel buildprereqs -- add an async start_tls backport in a non-default location (%%{nss_ldap_libdir}) * Tue Mar 1 2005 Tomas Mraz 2.2.23-2 - rebuild with openssl-0.9.7e