From ad0a3dd35744a3f58d74c838d6f8ee4239271b8d Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Jun 27 2011 09:20:15 +0000
Subject: Revert upstream hack that breaks ARC infosys


---

diff --git a/bdii-mdsvo.patch b/bdii-mdsvo.patch
new file mode 100644
index 0000000..70cce4d
--- /dev/null
+++ b/bdii-mdsvo.patch
@@ -0,0 +1,12 @@
+diff -ur bdii-5.2.3.orig/bin/bdii-update bdii-5.2.3/bin/bdii-update
+--- bdii-5.2.3.orig/bin/bdii-update	2011-06-13 19:46:02.000000000 +0200
++++ bdii-5.2.3/bin/bdii-update	2011-06-27 10:47:25.952850441 +0200
+@@ -519,7 +519,7 @@
+         if  ( dn[:11].lower() == "mds-vo-name" ):
+             if 'objectclass' in entry:
+                 if 'mds' in map( lambda x : x.lower(), entry['objectclass']):
+-                    if 'gluetop' or 'mdsvo' in map( lambda x : x.lower(), entry['objectclass']):
++                    if 'gluetop' in map( lambda x : x.lower(), entry['objectclass']):
+                         value=dn[12:dn.index(",")]
+                         entry = { 'dn': [dn], 'objectclass': ['MDS'], 'mds-vo-name': [value] }
+         entry = convert_back(entry)         
diff --git a/bdii.spec b/bdii.spec
index d583fe2..9c3833f 100644
--- a/bdii.spec
+++ b/bdii.spec
@@ -1,6 +1,6 @@
 Name:		bdii
 Version:	5.2.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Berkeley Database Information Index (BDII)
 
 Group:		System Environment/Daemons
@@ -12,6 +12,8 @@ URL:		https://twiki.cern.ch/twiki/bin/view/EGEE/BDII
 Source:		%{name}-%{version}.tar.gz
 #		Remove lsb dependency
 Patch0:		%{name}-init.patch
+#		Revert upstream hack that breaks ARC infosys
+Patch1:		%{name}-mdsvo.patch
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 
@@ -45,6 +47,7 @@ differences. This is then used to update the database.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 sed 's!/opt/bdii/etc/bdii.conf!/etc/bdii/bdii.conf!' -i etc/init.d/bdii
 
@@ -112,8 +115,8 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/DB_CONFIG
 %config(noreplace) %{_sysconfdir}/%{name}/bdii.conf
 %config(noreplace) %{_sysconfdir}/%{name}/BDII.schema
-%config(noreplace) %{_sysconfdir}/%{name}/bdii-slapd.conf
-%config(noreplace) %{_sysconfdir}/%{name}/bdii-top-slapd.conf
+%attr(-,ldap,ldap) %config(noreplace) %{_sysconfdir}/%{name}/bdii-slapd.conf
+%attr(-,ldap,ldap) %config(noreplace) %{_sysconfdir}/%{name}/bdii-top-slapd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/cron.d/bdii-proxy
@@ -123,6 +126,9 @@ fi
 %doc copyright
 
 %changelog
+* Mon Jun 27 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.2.3-2
+- Revert upstream hack that breaks ARC infosys
+
 * Mon Jun 13 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.2.3-1
 - New upstream version 5.2.3
 - Drop patches accepted upstream: bdii-runuser.patch, bdii-context.patch,