SPECS: openldap.spec - finished exchange and system_db bconds - re...

[qboosh]

Author: qboosh                       Date: Sat Nov  3 10:30:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- finished exchange and system_db bconds
- removed manual syncprov installation (make install does it already properly,
  manual install syncproc* breaks it)

---- Files affected:
SPECS:
   openldap.spec (1.270 -> 1.271) 

---- Diffs:

================================================================
Index: SPECS/openldap.spec
diff -u SPECS/openldap.spec:1.270 SPECS/openldap.spec:1.271
--- SPECS/openldap.spec:1.270	Sat Nov  3 02:20:52 2007
+++ SPECS/openldap.spec	Sat Nov  3 11:30:31 2007
@@ -782,7 +782,7 @@
 Сервера (демони), що поставляються з LDAP.
 
 %prep
-%setup -q -c -a1
+%setup -q -c %{!?with_system_db:-a1}
 cd %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
@@ -1032,8 +1032,6 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/openldap/*.a
 
-install servers/slapd/overlays/.libs/syncprov{.la,*.so*} $RPM_BUILD_ROOT%{_libdir}/openldap
-
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/ldap
 
@@ -1312,21 +1310,6 @@
 %attr(755,root,root) %ghost %{_libdir}/libldap-2.4.so.2
 %attr(755,root,root) %ghost %{_libdir}/libldap_r-2.4.so.2
 
-%files ldapc++
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libldapcpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libldapcpp.so.0
-
-%files ldapc++-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libldapcpp.so
-%{_libdir}/libldapcpp.la
-%{_includedir}/ldapc++
-
-%files ldapc++-static
-%defattr(644,root,root,755)
-%{_libdir}/libldapcpp.a
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/liblber.so
@@ -1344,6 +1327,7 @@
 %{_libdir}/libldap.a
 %{_libdir}/libldap_r.a
 
+%if %{with exchange}
 %files evolution-devel
 %defattr(644,root,root,755)
 %dir %{evolution_exchange_prefix}
@@ -1352,10 +1336,25 @@
 %{evolution_exchange_prefix}/README*
 %{evolution_exchange_includedir}/*.h
 %{evolution_exchange_libdir}/*.a
+%endif
+
+%files ldapc++
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libldapcpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libldapcpp.so.0
+
+%files ldapc++-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libldapcpp.so
+%{_libdir}/libldapcpp.la
+%{_includedir}/ldapc++
+
+%files ldapc++-static
+%defattr(644,root,root,755)
+%{_libdir}/libldapcpp.a
 
 %files backend-bdb
 %defattr(644,root,root,755)
-%doc db-%{db_version}/LICENSE
 %attr(755,root,root) %{_libdir}/openldap/back_bdb*.so*
 %{_libdir}/openldap/back_bdb.la
 %{_mandir}/man5/slapd-bdb.5*
@@ -1368,7 +1367,6 @@
 
 %files backend-hdb
 %defattr(644,root,root,755)
-%doc db-%{db_version}/LICENSE
 %attr(755,root,root) %{_libdir}/openldap/back_hdb*.so*
 %{_libdir}/openldap/back_hdb.la
 %{_mandir}/man5/slapd-hdb.5*
@@ -1539,6 +1537,11 @@
 
 %files servers
 %defattr(644,root,root,755)
+%if %{without system_db}
+# not used by slapd directly, but by two different backends (bdb,hdb), so include here
+%doc db-%{db_version}/LICENSE
+%attr(755,root,root) %{_libdir}/libslapd_db-4.6.so
+%endif
 %dir %{_sysconfdir}/openldap/schema
 %attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.conf
 %attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.access.conf
@@ -1551,15 +1554,14 @@
 %dir %{_datadir}/openldap/schema
 %{_datadir}/openldap/schema/*.ldif
 %{_datadir}/openldap/schema/*.schema
-%dir %{_libdir}/openldap/
+%dir %{_libdir}/openldap
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/libslapd_db-4.6.so
 %{_mandir}/man5/slapd.*.5*
 %{_mandir}/man5/slapd-config.5*
 %{_mandir}/man5/slapd-ldbm.5*
 %{_mandir}/man5/slapd-ldif.5*
 %{_mandir}/man5/slapd-null.5*
-%{_mandir}/man8/*
+%{_mandir}/man8/slap*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1567,6 +1569,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.271  2007/11/03 10:30:31  qboosh
+- finished exchange and system_db bconds
+- removed manual syncprov installation (make install does it already properly,
+  manual install syncproc* breaks it)
+
 Revision 1.270  2007/11/03 01:20:52  qboosh
 - more system_db
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openldap.spec?r1=1.270&r2=1.271&f=u