fix compat-slapcat compilation

Resolves:246581
This commit is contained in:
Jan Šafránek 2007-07-04 17:10:13 +00:00
parent 0f89c7c360
commit 6ecf74d102

View File

@ -13,7 +13,7 @@
Summary: The configuration files, libraries, and documentation for OpenLDAP
Name: openldap
Version: %{version_23}
Release: 5%{?dist}
Release: 6%{?dist}
License: OpenLDAP
Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@ -432,10 +432,9 @@ pushd openldap-%{compat_version}/build-compat/libraries
rm $RPM_BUILD_ROOT/%{_libdir}/*.so
popd
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/compat-openldap
pushd openldap-%{compat_version}/build-compat/servers/slapd
make install-tools DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
mv $RPM_BUILD_ROOT/%{_sbindir}/slapcat $RPM_BUILD_ROOT/%{_sbindir}/compat-slapcat
rm $RPM_BUILD_ROOT/%{_sbindir}/sl*
$libtool --mode=install /usr/bin/install -c -s -m 755 slapd $RPM_BUILD_ROOT/%{_libdir}/compat-openldap/slapcat
popd
# Install servers.
@ -675,7 +674,9 @@ fi
%attr(0755,root,root) %{_libdir}/liblber-2.2.so.*
%attr(0755,root,root) %{_libdir}/libldap-2.2.so.*
%attr(0755,root,root) %{_libdir}/libldap_r-2.2.so.*
%attr(0755,root,root) %{_sbindir}/compat-slapcat
%attr(0755,ldap,ldap) %dir %{_libdir}/compat-openldap
%attr(0755,root,root) %{_libdir}/compat-openldap/slapcat
%files servers
%defattr(-,root,root)
@ -746,6 +747,11 @@ fi
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
* Wed Jul 4 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-6%{?dist}
- fix compat-slapcat compilation. Now it can be found in
/usr/lib/compat-openldap/slapcat, because the tool checks argv[0]
(#246581)
* Fri Jun 29 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-5%{?dist}
- smbk5pwd added (#220895)
- correctly distribute modules between servers and servers-sql packages