[bdii/f16] Update to 5.2.7

[lfield]

commit b7c4a6b8b2feb536fc517dccbca08b80efe98def
Author: lfield <Laurence.Field at cern.ch>
Date:   Wed Feb 8 11:41:49 2012 +0100

    Update to 5.2.7

 bdii.spec |   45 +++++++++++++++++++++++----------------------
 sources   |    2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/bdii.spec b/bdii.spec
index 8f6b424..b64ea6a 100644
--- a/bdii.spec
+++ b/bdii.spec
@@ -1,5 +1,5 @@
 Name:		bdii
-Version:	5.2.6
+Version:	5.2.7
 Release:	1%{?dist}
 Summary:	The Berkeley Database Information Index (BDII)
 
@@ -8,7 +8,9 @@ License:	ASL 2.0
 URL:		https://twiki.cern.ch/twiki/bin/view/EGEE/BDII
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#   svn export http://svnweb.cern.ch/guest/gridinfo/bdii/tags/R_5_2_6 %{name}-%{version}
+#   svn export http://svnweb.cern.ch/guest/gridinfo/bdii/tags/R_5_2_7 %{name}-%{version}
+#  tar --gzip -czvf %{name}-%{version}.tar.gz %{name}-%{version} 
+
 Source:		%{name}-%{version}.tar.gz
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
@@ -42,42 +44,38 @@ differences. This is then used to update the database.
 %prep
 %setup -q
 
-sed 's!/opt/bdii/etc/bdii.conf!/etc/bdii/bdii.conf!' -i etc/init.d/bdii
-
 %build
-# Nothing to build
 
 %install
 rm -rf %{buildroot}
 make install prefix=%{buildroot}
 
-# Turn off default enabling of the service
-if [ -f %{buildroot}%{_initrddir}/%{name} ]; then
-    sed -e 's/\(chkconfig: \)\w*/\1-/' \
-	-e '/Default-Start/d' \
-	-e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
-	-i %{buildroot}%{_initrddir}/%{name}
-else
-    mkdir -p %{buildroot}%{_initrddir}
-    sed -e 's/\(chkconfig: \)\w*/\1-/' \
-	-e '/Default-Start/d' \
-	-e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
-	%{buildroot}%{_sysconfdir}/init.d/%{name} > \
-	%{buildroot}%{_initrddir}/%{name}
-    chmod 0755 %{buildroot}%{_initrddir}/%{name}
-    rm %{buildroot}%{_sysconfdir}/init.d/%{name}
-fi
-
 chmod 644 %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+# Temp fix for upgrade from 5.2.5 to 5.2.7
+service %{name} status > /dev/null 2>&1
+if [ $? = 0 ]; then 
+    touch /var/run/bdii/bdii.upgrade
+    service %{name} stop > /dev/null 2>&1
+fi
+
 %post
 sed "s/\(rootpw *\)secret/\1$(mkpasswd -s 0 | tr '/' 'x')/" \
     -i %{_sysconfdir}/%{name}/bdii-slapd.conf \
        %{_sysconfdir}/%{name}/bdii-top-slapd.conf
+
+# Temp fix for upgrade from 5.2.5 to 5.2.7
+if [ -f /var/run/bdii/bdii.upgrade ]; then
+    rm -f /var/run/bdii/bdii.upgrade
+    service %{name} start > /dev/null 2>&1
+fi
+
 /sbin/chkconfig --add %{name}
+
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 semanage port -a -t ldap_port_t -p tcp 2170 2>/dev/null || :
 semanage fcontext -a -t slapd_db_t "%{_localstatedir}/lib/%{name}/db(/.*)?" 2>/dev/null || :
@@ -122,6 +120,9 @@ fi
 %doc copyright
 
 %changelog
+* Tue Feb 7 2012 Laurence Field <laurence.field at cern.ch> - 5.2.7-1
+- Performance improvements to reduce memory and disk usage
+
 * Wed Jan 25 2012 Laurence Field <laurence.field at cern.ch> - 5.2.6-1
 - New upstream version that includes fedora patches and fix for EGI RT 3235
 
diff --git a/sources b/sources
index 6c47a36..c46ffad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec936354d44f4e022b3cc3c0ef894c60  bdii-5.2.6.tar.gz
+a57f90b32d72cf4f5bdc00746c44f282  bdii-5.2.7.tar.gz