OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Sep-2007 19:30:22
Branch: HEAD Handle: 2007092218302100
Modified files:
openpkg-src/openldap openldap.spec
Log:
DB_CONFIG has to be in the database dir
Summary:
Revision Changes Path
1.195 +3 -4 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.194 -r1.195 openldap.spec
--- openpkg-src/openldap/openldap.spec 22 Sep 2007 17:22:25 -0000
1.194
+++ openpkg-src/openldap/openldap.spec 22 Sep 2007 17:30:21 -0000
1.195
@@ -210,9 +210,10 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
# post adjustment: move files
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG.example
%if "%{with_server}" == "yes"
- mv $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG.example \
- $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG
+ mv
$RPM_BUILD_ROOT%{l_prefix}/var/openldap/openldap-data/DB_CONFIG.example \
+ $RPM_BUILD_ROOT%{l_prefix}/var/openldap/openldap-data/DB_CONFIG
%endif
# post adjustment: enable and correct slurpd.pid (slapd.pid as a
precaution, too)
@@ -264,7 +265,6 @@
%if "%{with_server}" != "yes"
rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
- rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/DB_CONFIG
rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/openldap
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/slapi-plugin.h
@@ -280,7 +280,6 @@
'%config %{l_prefix}/etc/fsl/fsl.openldap' \
'%config %{l_prefix}/etc/openldap/schema/*.schema' \
'%config %{l_prefix}/etc/openldap/schema/*.ldif' \
- '%config %{l_prefix}/etc/openldap/DB_CONFIG' \
%endif
'%config %{l_prefix}/etc/openldap/*.conf'
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
