[dpm-dsi/el6] Update to 1.8.4 upstream release. 1.9.0 rolled back

[Alejandro Alvarez]

commit c14a05bffb3834943e485947dd562bc6e312c58e
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Wed Jul 17 10:36:44 2013 +0200

    Update to 1.8.4 upstream release. 1.9.0 rolled back

 .gitignore   |    1 +
 dpm-dsi.spec |   51 ++++++++++++++++++++++++++++-----------------------
 sources      |    2 +-
 3 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d0961f..da0963c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /dpm-dsi-1.8.2.tar.gz
 /dpm-dsi-1.8.3.tar.gz
 /dpm-dsi-1.9.0.tar.gz
+/dpm-dsi-1.8.4.tar.gz
diff --git a/dpm-dsi.spec b/dpm-dsi.spec
index c37e73a..726dd5e 100644
--- a/dpm-dsi.spec
+++ b/dpm-dsi.spec
@@ -1,23 +1,22 @@
 Name:		dpm-dsi
 Summary:	Disk Pool Manager (DPM) plugin for the Globus GridFTP server
-Version:	1.9.0
-Release:	3%{?dist}
+Version:	1.8.4
+Release:	1%{?dist}
 License:	ASL 2.0
 Group:		Applications/Internet
 URL:		https://svnweb.cern.ch/trac/lcgdm/wiki/Dpm
 # The source of this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
-# svn export http://svn.cern.ch/guest/lcgdm/dpm-dsi/tags/dpm-dsi_1_9_0 dpm-dsi-1.9.0
-# tar -czvf dpm-dsi-1.9.0.tar.gz dpm-dsi-1.9.0 
+# svn export http://svn.cern.ch/guest/lcgdm/dpm-dsi/tags/dpm-dsi_1_8_4 dpm-dsi-1.8.4
+# tar -czvf dpm-dsi-1.8.4.tar.gz dpm-dsi-1.8.4
 Source0:	%{name}-%{version}.tar.gz
-# It does not make sense to provide internal header files
-# https://svnweb.cern.ch/trac/lcgdm/changeset/8789/dpm-dsi/trunk
-Patch0:		no-headers.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:		cmake
-BuildRequires:		dmlite-devel
+BuildRequires:		dpm-devel
+BuildRequires:		lcgdm-devel
 BuildRequires:		globus-gridftp-server-devel
+BuildRequires:		voms-devel
 
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
@@ -44,7 +43,6 @@ required to expose the data using this protocol.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
 
 %build
 %cmake . -DCMAKE_INSTALL_PREFIX=/
@@ -62,12 +60,25 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%{_libdir}/libglobus_gridftp_server_dpm*.so*
 %{_initrddir}/dpm-gsiftp
-%config(noreplace) %{_sysconfdir}/logrotate.d/dpm-gsiftp
-%config(noreplace) %{_sysconfdir}/sysconfig/dpm-gsiftp
-%{_libdir}/libglobus_gridftp_server_dmlite*.so*
+%config(noreplace) %{_sysconfdir}/logrotate.d/dpm-dsi
+%{_datadir}/%{name}/dpm-gsiftp.sysconfig
 %{_localstatedir}/log/dpm-gsiftp
-%doc LICENSE RELEASE-NOTES
+%doc LICENSE RELEASE-NOTES doc/INSTALL-gsiftp
+
+%package devel
+Summary:	DPM GridFTP plugin development headers and libraries
+Group:		Development/Libraries
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+ 
+%description devel
+This package contains common development libraries and header files for the
+DPM GridFTP plugin.
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/dsi_dpm.h
 
 %post
 /sbin/chkconfig --add dpm-gsiftp
@@ -86,15 +97,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
-* Mon May 06 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.0-3
-- Removed devel package
-- Removed %{?_isa} suffix from globus-gridftp-server-progs
-
-* Mon Apr 22 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.9.0-2
-- Rebuilt for globus-gridftp-server-progs update
-
-* Wed Dec 19 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.9.0-1
-- Update for new upstream release
+* Wed Jul 17 2013 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.4-1
+- Update to new upstream release 1.8.4
+- Fixed bogus date
 
 * Fri Dec 14 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.3-1
 - Update to new upstream release
@@ -109,7 +114,7 @@ fi
 * Mon Nov 28 2011 Dan Horák <dan[at]danny.cz> - 1.8.2-6
 - fix build on 64-bit arches (s390x, sparc64 and possibly others)
 
-* Wed Nov 15 2011 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.2-5
+* Tue Nov 15 2011 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.2-5
 - Removed architecture from globus-gridftp-server-progs requires
 
 * Wed Nov 09 2011 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.2-4
diff --git a/sources b/sources
index 391aa1c..7b57979 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ae3915b47f7b19907a55f60569e1168  dpm-dsi-1.9.0.tar.gz
+a188ff31f54bb9f976672eb28eeb19e6  dpm-dsi-1.8.4.tar.gz