packages: openldap/openldap.spec - rel 2 - fix schemadir

[baggins]

Author: baggins                      Date: Tue Nov  3 14:03:00 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix schemadir

---- Files affected:
packages/openldap:
   openldap.spec (1.318 -> 1.319) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.318 packages/openldap/openldap.spec:1.319
--- packages/openldap/openldap.spec:1.318	Tue Oct  6 18:49:46 2009
+++ packages/openldap/openldap.spec	Tue Nov  3 15:02:55 2009
@@ -32,7 +32,7 @@
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
 Version:	2.4.19
-Release:	1
+Release:	2
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
@@ -100,6 +100,7 @@
 
 %define		_libexecdir	%{_sbindir}
 %define		_localstatedir	/var/lib
+%define		schemadir	%{_datadir}/openldap/schema
 
 %undefine	configure_cache
 
@@ -1145,9 +1146,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/lib/openldap-data} \
+	$RPM_BUILD_ROOT{%{_sbindir},%{_libdir},%{schemadir}}
 	$RPM_BUILD_ROOT/var/run/slapd \
-	$RPM_BUILD_ROOT%{_datadir}/openldap/schema \
-	$RPM_BUILD_ROOT{%{_sbindir},%{_libdir}}
 
 %if %{with exchange}
 # Install evolution hack first and remove everything but devel stuff
@@ -1178,7 +1178,7 @@
 
 %{__make} -C contrib/slapd-modules/nssov install \
 	moduledir=%{_libdir}/openldap \
-	schemadir=%{_datadir}/openldap/schema \
+	schemadir=%{schemadir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
@@ -1712,7 +1712,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
+%{schemadir}/ldapns.schema
 
 %files overlay-pcache
 %defattr(644,root,root,755)
@@ -1801,10 +1801,10 @@
 %attr(770,root,slapd) %{_var}/run/slapd
 %dir %attr(770,root,slapd) %{_localstatedir}/openldap-data
 %attr(660,root,slapd) %{_localstatedir}/openldap-data/*
-%dir %{_datadir}/openldap/schema
-%{_datadir}/openldap/schema/*.ldif
-%{_datadir}/openldap/schema/*.schema
-%exclude %{_datadir}/openldap/schema/ldapns.schema
+%dir %{schemadir}
+%{schemadir}/*.ldif
+%{schemadir}/*.schema
+%exclude %{schemadir}/ldapns.schema
 %dir %{_libdir}/openldap
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man5/slapd.*.5*
@@ -1820,6 +1820,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.319  2009/11/03 14:02:55  baggins
+- rel 2
+- fix schemadir
+
 Revision 1.318  2009/10/06 16:49:46  amateja
 - updated to 2.4.19
 - removed useless openldap-auditlog-modify.patch
================================================================

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