[lcgdm/el5] Upstream provided a wrong tag by mistake. Rebuild with the new code

[Alejandro Alvarez]

commit 4be6cf2d931d2ee69ba004380a01573814a909d9
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Mar 14 11:40:58 2014 +0100

    Upstream provided a wrong tag by mistake. Rebuild with the new code

 lcgdm.spec |   49 +++++++++++++++++++++++++++++++++++++++++++------
 sources    |    3 +--
 2 files changed, 44 insertions(+), 8 deletions(-)
---
diff --git a/lcgdm.spec b/lcgdm.spec
index 203a032..1c29ca6 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -34,9 +34,14 @@
 %global systemd 0
 %endif
 
+# by default, argus support should not be included
+%{!?_with_argus: %{!?without_argus: %define _without_argus --without-argus}}
+# make sure only one option is defined
+%{?_with_argus: %{?_without_argus: %{error: both _with_argus and _without_argus}}}
+
 Name:		lcgdm
 Version:	1.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
@@ -90,6 +95,15 @@ BuildRequires:	%{altpython}-devel%{?_isa}
 BuildRequires:	systemd-units
 %endif
 
+BuildRequires:	groff
+
+# This cannot be executed in the case of pure EPEL builds
+# as Argus is not available there
+%{?_with_argus:BuildRequires:  argus-pep-api-c >= 2.2.0}
+%{?_with_argus:BuildRequires:  argus-pep-api-c-devel >= 2.2.0}
+
+
+
 %description
 The lcgdm package provides the LCG Data Management components: the LFC
 (LCG File Catalog) and the DPM (Disk Pool Manager).
@@ -518,20 +532,31 @@ popd
 
 done
 
+%if %{?_with_argus:1}%{!?_with_argus:0}
+%package -n dpm-argus
+Summary:	DPM Argus support
+Group:		Applications/Internet
+Requires:	dpm-mysql-nameserver = %{version}-%{release}
+Provides:	dpm-argus = %{version}-%{release}
+
+%description -n dpm-argus
+Argus support for the Disk Pool Manager (DPM).
+%endif
+
 %build
 gsoapversion=`soapcpp2 -v 2>&1 | grep C++ | sed 's/.* //'`
 
 pushd lfc-mysql/%{name}-%{version}
 
 ./configure lfc %{?_with_swig} \
+	%{?_without_argus} \
 	--with-mysql \
 	--libdir=%{_lib} \
 	--with-gsoap-version=$gsoapversion \
 	--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
 	--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
 	--with-etc-dir='$(prefix)/../etc' \
-	--with-emi \
-	--without-argus
+	--with-emi 
 
 make -f Makefile.ini Makefiles
 
@@ -542,6 +567,7 @@ popd
 pushd dpm-mysql/%{name}-%{version}
 
 ./configure dpm \
+	%{?_without_argus} \
 	--with-mysql \
 	--libdir=%{_lib} \
 	--with-gsoap-version=$gsoapversion \
@@ -549,8 +575,7 @@ pushd dpm-mysql/%{name}-%{version}
 	--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
 	--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
 	--with-etc-dir='$(prefix)/../etc' \
-	--with-emi \
-	--without-argus
+	--with-emi 
 
 make -f Makefile.ini Makefiles
 
@@ -1383,6 +1408,7 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/lfc-*
 %doc %{_mandir}/man1/lfc-*
+%{_libexecdir}/lcg-info-provider-lfc
 
 %files -n lfc-perl
 %defattr(-,root,root,-)
@@ -1459,7 +1485,6 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/lfc-dli
 %endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/lfc-dli
-%{_libexecdir}/lcg-info-provider-lfc
 
 %files -n dpm-libs
 %defattr(-,root,root,-)
@@ -1652,7 +1677,19 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/rfiod
 %doc %{_mandir}/man8/rfiod.8*
 
+%if %{?_with_argus:1}%{!?_with_argus:0}
+%files -n dpm-argus
+%defattr(-,root,root,-)
+%{_bindir}/dpns-arguspoll
+%endif
+
 %changelog
+* Fri Mar 14 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.8-2
+- Upstream provided a wrong tag by mistake. Rebuild with the new code
+
+* Wed Mar 12 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.8-1
+- Update for new upstream release
+
 * Mon Dec 02 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.7-4
 - Packaging star-accounting.py
 
diff --git a/sources b/sources
index f9a40e3..d940b34 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-942ef9000ca258909a7bbad439c82610  lcgdm-1.8.7.tar.gz
 5697217008737c454673c86deb3f03d5  lcgdm-unitfiles.tar.gz
-9b587576d52b7ab2e94b94877ee8efc0  lcgdm-1.8.8.tar.gz
+10016356a944f6462879cea7131825c4  lcgdm-1.8.8.tar.gz