Author: baggins Date: Wed Feb 27 14:42:41 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 2.4.8 - added socket backend - fixed .la poisoning
---- Files affected: SPECS: openldap.spec (1.280 -> 1.281) ---- Diffs: ================================================================ Index: SPECS/openldap.spec diff -u SPECS/openldap.spec:1.280 SPECS/openldap.spec:1.281 --- SPECS/openldap.spec:1.280 Sat Feb 23 22:57:25 2008 +++ SPECS/openldap.spec Wed Feb 27 15:42:36 2008 @@ -1,7 +1,5 @@ # $Revision$, $Date$ # TODO: -# - fix *.la poisoning (when not using system db) with paths as: -# -L/home/users/builder/rpm/BUILD/openldap-2.4.7/db-instroot/lib64 # - package contribs? # - complete & validate descriptions # - trigger for removed ldbm backend @@ -30,12 +28,12 @@ Summary(ru.UTF-8): Образцы клиентов LDAP Summary(uk.UTF-8): Зразки клієнтів LDAP Name: openldap -Version: 2.4.7 -Release: 2 +Version: 2.4.8 +Release: 1 License: OpenLDAP Public License Group: Networking/Daemons Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz -# Source0-md5: 4738ccb79215c027b857a6ea56e7351d +# Source0-md5: 5ef2ea680479e0cee13fdf64a4ef548a Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz # Source1-md5: 718082e7e35fc48478a2334b0bc4cd11 Source2: ldap.init @@ -79,6 +77,7 @@ %{?with_perl:BuildRequires: perl-devel} BuildRequires: readline-devel >= 4.2 BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 BuildRequires: uname(release) >= 2.6 %{?with_odbc:BuildRequires: unixODBC-devel} Requires: %{name}-libs = %{version}-%{release} @@ -402,6 +401,19 @@ %description backend-shell -l pl.UTF-8 Backend Shell do slapd - serwera OpenLDAP. +%package backend-sock +Summary: Socket backend to OpenLDAP server +Summary(pl.UTF-8): Backend Socket do serwera OpenLDAP +Group: Networking/Daemons +Requires(post,preun): sed >= 4.0 +Requires: %{name}-servers = %{version}-%{release} + +%description backend-sock +Socket backend to slapd, the OpenLDAP server. + +%description backend-sock -l pl.UTF-8 +Backend Socket do slapd - serwera OpenLDAP. + %package backend-sql Summary: SQL backend to OpenLDAP server Summary(pl.UTF-8): Backend SQL do serwera OpenLDAP @@ -929,6 +941,7 @@ %endif --enable-relay=mod \ --enable-shell=mod \ + --enable-sock=mod \ %if %{with odbc} --enable-sql=mod \ --with-odbc=unixodbc \ @@ -995,7 +1008,7 @@ --disable-slp \ %endif --enable-wrappers \ - --enable-backands=no \ + --enable-backends=no \ --enable-overlays=no \ %if %{with odbc} --with-odbc=unixodbc \ @@ -1025,6 +1038,7 @@ %endif %if %{without system_db} +dbdir=`pwd`/db-instroot cd db-instroot install -m755 %{_lib}/libslapd_db-*.*.so $RPM_BUILD_ROOT%{_libdir} cd bin @@ -1068,6 +1082,10 @@ %{__make} -C contrib/ldapc++ install \ DESTDIR=$RPM_BUILD_ROOT +%if %{without system_db} +find $RPM_BUILD_ROOT -name \*.la | xargs sed -i -e "s|-L${dbdir}/%{_lib}||g" +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -1182,6 +1200,12 @@ %preun backend-shell %ldap_module_remove back_shell.la +%post backend-sock +%ldap_module_add back_sock.la + +%preun backend-sock +%ldap_module_remove back_sock.la + %post backend-sql %ldap_module_add back_sql.la @@ -1435,6 +1459,12 @@ %{_libdir}/openldap/back_shell.la %{_mandir}/man5/slapd-shell.5* +%files backend-sock +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/openldap/back_sock*.so* +%{_libdir}/openldap/back_sock.la +%{_mandir}/man5/slapd-sock.5* + %if %{with odbc} %files backend-sql %defattr(644,root,root,755) @@ -1586,6 +1616,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.281 2008-02-27 14:42:36 baggins +- up to 2.4.8 +- added socket backend +- fixed .la poisoning + Revision 1.280 2008-02-23 21:57:25 glen - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openldap.spec?r1=1.280&r2=1.281&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
