[lcgdm/el5] Update for upstream 1.8.8 release

[Alejandro Alvarez]

commit de2022ab30fc2716b0b676a09b79f16fac8e6ed6
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Wed Mar 12 15:06:58 2014 +0100

    Update for upstream 1.8.8 release

 lcgdm.spec |   37 +++++++++++++++++++++++++++----------
 sources    |    1 +
 2 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/lcgdm.spec b/lcgdm.spec
index 399c635..203a032 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -35,15 +35,15 @@
 %endif
 
 Name:		lcgdm
-Version:	1.8.7
-Release:	4%{?dist}
+Version:	1.8.8
+Release:	1%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
 License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
-#		LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_7_3 lcgdm-1.8.7
-#		tar --exclude .svn -z -c -f lcgdm-1.8.7.tar.gz lcgdm-1.8.7
+#		LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_8 lcgdm-1.8.8
+#		tar --exclude .svn -z -c -f lcgdm-1.8.8.tar.gz lcgdm-1.8.8
 Source0:	%{name}-%{version}.tar.gz
 #		Systemd unit files
 Source1:	%{name}-unitfiles.tar.gz
@@ -108,6 +108,17 @@ components: the LFC (LCG File Catalog) and the DPM (Disk Pool Manager).
 Summary:	LCG Data Management common development files
 Group:		Development/Libraries
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+%if 0%{?el5}
+%ifarch %{ix86}
+Provides:   %{name}-devel(x86-32)
+%endif
+%ifnarch %{ix86} ppc ppc64 s390 s390x sparc sparc64
+# why doesn't ifarch x86_64 work?
+Provides:   %{name}-devel(x86-64)
+%endif
+%else
+Provides:   %{name}-devel%{?_isa}
+%endif
 
 %description devel
 This package contains common development libraries and header files
@@ -181,8 +192,8 @@ Requires:	lfc-libs%{?_isa} = %{version}-%{release}
 Requires:	python(abi) = 2.6
 %endif
 %if %{altpython} == python26
-Provides:	python26-dpm
-Obsoletes:	python26-dpm
+Provides:	python26-lfc
+Obsoletes:	python26-lfc
 %endif
 
 %description -n lfc-%{altpython}
@@ -227,7 +238,7 @@ Group:		Applications/Internet
 Requires:	lfcdaemon = %{version}-%{release}
 
 Requires(pre):		shadow-utils
-Requires(post):		finger
+Requires(post):         finger
 %if %systemd
 Requires(post):		systemd-units
 Requires(preun):	systemd-units
@@ -317,8 +328,8 @@ Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Requires:	python(abi) = 2.6
 %endif
 %if %{altpython} == python26
-Provides:	python26-lfc
-Obsoletes:	python26-lfc
+Provides:	python26-dpm
+Obsoletes:	python26-dpm
 %endif
 
 %description -n dpm-%{altpython}
@@ -333,6 +344,9 @@ Summary:	Disk Pool Manager (DPM) server with MySQL database back-end
 Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Requires:	finger%{?_isa}
+Requires:	MySQL-python
+Requires:	python-lxml
+Requires:	python-uuid
 Provides:	dpm-mysql = %{version}-%{release}
 Obsoletes:	dpm-mysql < 1.8.1.2-2
 Provides:	DPM-server-mysql = %{version}-%{release}
@@ -773,10 +787,11 @@ install -m 755 lfc-mysql/%{name}-%{version}/scripts/upgrades/*.pm ${RPM_BUILD_RO
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/upgrades/cns-db* ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/upgrades
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/upgrades/dpm-db* ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/upgrades
 
-# Add tge star accounting scripts
+# Add the star accounting script
 mkdir ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/scripts
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/StAR-accounting/star-accounting.py ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/scripts
 
+
 # Add the LFC info provider script
 mkdir ${RPM_BUILD_ROOT}%{_libexecdir}
 install -m 755 lfc-mysql/%{name}-%{version}/scripts/lcg-info-provider-lfc ${RPM_BUILD_ROOT}%{_libexecdir}
@@ -1431,6 +1446,7 @@ fi
 %config(noreplace) %{_sysconfdir}/lfc-mysql/lfcdaemon.logrotate
 %ghost %{_sysconfdir}/logrotate.d/lfcdaemon
 %doc %{_datadir}/lcgdm/create_lfc_tables_mysql.sql
+%{_datadir}/lcgdm/upgrades/cns-db-*
 
 %files -n lfc-dli
 %defattr(-,root,root,-)
@@ -1456,6 +1472,7 @@ fi
 %doc %{_mandir}/man3/dpm_[a-o]*.3*
 %doc %{_mandir}/man3/dpm_ping.3*
 %doc %{_mandir}/man3/dpm_put.3*
+%doc %{_mandir}/man3/dpm_putx.3*
 %doc %{_mandir}/man3/dpm_putdone.3*
 %doc %{_mandir}/man3/dpm_[q-z]*.3*
 %doc %{_mandir}/man3/dpns_*.3*
diff --git a/sources b/sources
index a8bd677..f9a40e3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 942ef9000ca258909a7bbad439c82610  lcgdm-1.8.7.tar.gz
 5697217008737c454673c86deb3f03d5  lcgdm-unitfiles.tar.gz
+9b587576d52b7ab2e94b94877ee8efc0  lcgdm-1.8.8.tar.gz