[dpm-xrootd/el5] updated to upstream 3.3.1 release

[Ricardo Rocha]

commit 87972bebe65660d50768fecd2b24747af5629cf8
Author: Ricardo Rocha <rocha at fedoraproject.com>
Date:   Thu Mar 7 19:27:19 2013 +0100

    updated to upstream 3.3.1 release

 .gitignore      |    1 +
 dpm-xrootd.spec |   42 +++++++++++++++++++++++++++++-------------
 sources         |    2 +-
 3 files changed, 31 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc429ab..fda7241 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /dpm-xrootd-3.1.0.tar.gz
+/dpm-xrootd-3.3.1.tar.gz
diff --git a/dpm-xrootd.spec b/dpm-xrootd.spec
index 11c267f..7eca092 100644
--- a/dpm-xrootd.spec
+++ b/dpm-xrootd.spec
@@ -1,21 +1,22 @@
 Name:		dpm-xrootd
 Summary:	XROOT interface to the Disk Pool Manager (DPM)
-Version:	3.1.0
-Release:	3%{?dist}
+Version:	3.3.1
+Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://svnweb.cern.ch/trac/lcgdm
 # 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-xrootd/tags/dpm-xrootd_3_1_0 dpm-xrootd-3.1.0
-# tar -czvf dpm-xrootd-3.1.0.tar.gz dpm-xrootd-3.1.0
+# svn export http://svn.cern.ch/guest/lcgdm/dpm-xrootd/tags/dpm-xrootd_3_3_1 dpm-xrootd-3.3.1
+# tar -czvf dpm-xrootd-3.3.1.tar.gz dpm-xrootd-3.3.1
 Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake
-BuildRequires:	dpm-devel
+BuildRequires:	dmlite-devel >= 0.6.0
 BuildRequires:	openssl-devel
 BuildRequires:	xrootd-devel
+BuildRequires:	xrootd-server-devel
 
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
@@ -58,8 +59,8 @@ rm -rf %{buildroot}
 
 %preun
 if [ "$1" = "0" ]; then
-    /sbin/service xrootd stop >/dev/null 2>&1
-    /sbin/service cmsd stop >/dev/null 2>&1
+    /sbin/service xrootd stop >/dev/null 2>&1 || :
+    /sbin/service cmsd stop >/dev/null 2>&1 || :
 fi
 
 %postun
@@ -71,18 +72,33 @@ fi
 
 %files
 %defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/xrootd/*.cfg
-%config(noreplace) %{_sysconfdir}/sysconfig/xrootd.dpm-templ
-%{_libdir}/libXrdDPM*.so.*
+%config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmdisk.cfg
+%config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmfedredir_atlas.cfg
+%config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmredir.cfg
+%{_libdir}/libXrdDPMDiskAcc.so.3
+%{_libdir}/libXrdDPMDiskAcc.so.3.3.1
+%{_libdir}/libXrdDPMFinder.so.3
+%{_libdir}/libXrdDPMFinder.so.3.3.1
+%{_libdir}/libXrdDPMOss.so.3
+%{_libdir}/libXrdDPMOss.so.3.3.1
+%{_libdir}/libXrdDPMRedirAcc.so.3
+%{_libdir}/libXrdDPMRedirAcc.so.3.3.1
 %doc COPYING
 
 %files devel 
 %defattr(-,root,root) 
-%dir %{_includedir}/XrdDPM 
-%{_includedir}/XrdDPM/* 
-%{_libdir}/libXrdDPM*.so 
+%dir %{_includedir}/XrdDPM
+%{_includedir}/XrdDPM/XrdCompileVersion.hh
+%{_libdir}/libXrdDPMDiskAcc.so
+%{_libdir}/libXrdDPMFinder.so
+%{_libdir}/libXrdDPMOss.so
+%{_libdir}/libXrdDPMRedirAcc.so
 
 %changelog
+* Thu Mar 07 2013 Ricardo Rocha <ricardo.rocha at cern.ch> - 3.3.1-1
+- Update to new upstream release
+- Added dependency on dmlite libraries
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 8bd4cb4..b8a7c4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afaea30b20f8b579a2a6e18a8167f24d  dpm-xrootd-3.1.0.tar.gz
+6b8e1ccbc458644a737ba0a206965fd7  dpm-xrootd-3.3.1.tar.gz