packages: openldap/openldap.spec - up to 2.4.18 - updated nssov overlay bui...

[baggins]

Author: baggins                      Date: Wed Sep 30 18:20:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.4.18
- updated nssov overlay build
- added new sssvlv overlay

---- Files affected:
packages/openldap:
   openldap.spec (1.316 -> 1.317) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.316 packages/openldap/openldap.spec:1.317
--- packages/openldap/openldap.spec:1.316	Sat Sep 12 13:09:55 2009
+++ packages/openldap/openldap.spec	Wed Sep 30 20:20:21 2009
@@ -31,12 +31,12 @@
 Summary(ru.UTF-8):	Образцы клиентов LDAP
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
-Version:	2.4.17
-Release:	5
+Version:	2.4.18
+Release:	1
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5:	5e82103780f8cfc2b2fbd0f77c47c158
+# Source0-md5:	fecd7a64b6d9a0eb79b817d2562956ed
 Source1:	http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 # Source1-md5:	718082e7e35fc48478a2334b0bc4cd11
 Source2:	ldap.init
@@ -746,6 +746,27 @@
 uaktualnianie kluczy Kerberosa i skrótów haseł Samby dla użytkownika
 LDAP.
 
+%package overlay-sssvlv
+Summary:	Server Side Sorting and Virtual List View overlay for OpenLDAP server
+Summary(pl.UTF-8):	Nakładka Sortowania po stronie serwera i virtualnego widoku dla serwera OpenLDAP
+Group:		Networking/Daemons
+Requires(post,preun):	sed >= 4.0
+Requires:	%{name}-servers = %{version}-%{release}
+
+%description overlay-sssvlv
+This overlay implements the LDAP Server Side Sorting (RFC2891)
+control as well as the Virtual List View control. It also replaces
+the default implementation of the LDAP PagedResults (RFC2696)
+control, to ensure that it works with Sorting. The overlay can
+be used with any backend or globally for all backends.
+
+%description overlay-sssvlv -l pl.UTF-8
+Ta nakładka implementuje Sortowanie po Stronie Servera (RFC2891)
+oraz Widoki List Wirtualnych. Zastępuje również domyślną
+implementację Stronicowanych Wyników (RFC2696) aby zapewnić
+ich działanie z sortowaniem. Nakładka może być użyta w dowolnym
+backendzie albo globalnie dla wszystkich backendów.
+
 %package overlay-syncprov
 Summary:	Syncrepl Provider overlay for OpenLDAP server
 Summary(pl.UTF-8):	Nakładka Syncrepl Provider dla serwera OpenLDAP
@@ -1046,7 +1067,9 @@
 %{__make}
 
 %{__make} -j1 -C contrib/slapd-modules/nssov \
-	OPT="%{rpmcflags}"
+	libdir=%{_libdir}/openldap \
+	OPT="%{rpmcflags}" \
+	nssov.la
 
 install -d libs
 for d in liblber libldap libldap_r ; do
@@ -1155,11 +1178,10 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/openldap/*.a
 
-sed -e "s|/usr/local/libexec/openldap|%{_libdir}/%{name}|" contrib/slapd-modules/nssov/.libs/nssov.la \
-	> $RPM_BUILD_ROOT/%{_libdir}/%{name}/nssov.la
-install contrib/slapd-modules/nssov/.libs/nssov.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/%{name}
-ln -s nssov.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/%{name}/nssov.so.0
-ln -s nssov.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/%{name}/nssov.so
+%{__make} -C contrib/slapd-modules/nssov install \
+	moduledir=%{_libdir}/openldap \
+	schemadir=%{_datadir}/openldap/schema \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/ldap
@@ -1387,10 +1409,18 @@
 
 %post overlay-nssov
 %ldap_module_add nssov.la
+%openldap_schema_register %{schemadir}/ldapns.schema
+%service -q ldap restart
 
 %preun overlay-nssov
 %ldap_module_remove nssov.la
 
+%postun overlay-nssov
+if [ "$1" = "0" ]; then
+	%openldap_schema_unregister %{schemadir}/ldapns.schema
+	%service -q ldap restart
+fi
+
 %post overlay-ppolicy
 %ldap_module_add ppolicy.la
 
@@ -1427,6 +1457,12 @@
 %preun overlay-seqmod
 %ldap_module_remove seqmod.la
 
+%post overlay-sssvlv
+%ldap_module_add sssvlv.la
+
+%preun overlay-sssvlv
+%ldap_module_remove sssvlv.la
+
 %post overlay-syncprov
 %ldap_module_add syncprov.la
 
@@ -1678,6 +1714,7 @@
 %doc %{name}-%{version}/contrib/slapd-modules/nssov/README
 %attr(755,root,root) %{_libdir}/openldap/nssov*.so*
 %{_libdir}/openldap/nssov.la
+%{_datadir}/openldap/schema/ldapns.schema
 
 %files overlay-pcache
 %defattr(644,root,root,755)
@@ -1720,6 +1757,12 @@
 %attr(755,root,root) %{_libdir}/openldap/seqmod*.so*
 %{_libdir}/openldap/seqmod.la
 
+%files overlay-sssvlv
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/openldap/sssvlv*.so*
+%{_libdir}/openldap/sssvlv.la
+%{_mandir}/man5/slapo-sssvlv.5*
+
 %files overlay-syncprov
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/openldap/syncprov*.so*
@@ -1763,6 +1806,7 @@
 %dir %{_datadir}/openldap/schema
 %{_datadir}/openldap/schema/*.ldif
 %{_datadir}/openldap/schema/*.schema
+%exclude %{_datadir}/openldap/schema/ldapns.schema
 %dir %{_libdir}/openldap
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man5/slapd.*.5*
@@ -1778,6 +1822,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.317  2009/09/30 18:20:21  baggins
+- up to 2.4.18
+- updated nssov overlay build
+- added new sssvlv overlay
+
 Revision 1.316  2009/09/12 11:09:55  radek
 - release 5: strict DynaLoader dep no longer required
 
================================================================

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