[xrootd] Update to version 3.2.1

[Mattias Ellert]

commit e6d41cb834c55a908bd6549c421e6b629319f211
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu May 17 11:32:04 2012 +0200

    Update to version 3.2.1

 sources           |    2 +-
 xrootd-perl.patch |   14 +++++++-------
 xrootd.spec       |   37 ++++++++++++++-----------------------
 3 files changed, 22 insertions(+), 31 deletions(-)
---
diff --git a/sources b/sources
index 97ac3b7..676b451 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6466b12a99aed3f8ea0b56b5b3ace093  xrootd-3.1.1.tar.gz
+b3f86bb9e10d7a7bd2bc99894e332794  xrootd-3.2.1.tar.gz
diff --git a/xrootd-perl.patch b/xrootd-perl.patch
index b9a021a..48153f9 100644
--- a/xrootd-perl.patch
+++ b/xrootd-perl.patch
@@ -1,12 +1,12 @@
-diff -ur xrootd-3.1.1.orig/src/XrdClient.cmake xrootd-3.1.1/src/XrdClient.cmake
---- xrootd-3.1.1.orig/src/XrdClient.cmake	2012-03-05 18:19:18.000000000 +0100
-+++ xrootd-3.1.1/src/XrdClient.cmake	2012-03-13 06:34:04.356120842 +0100
+diff -ur xrootd-3.2.1.orig/src/XrdClient.cmake xrootd-3.2.1/src/XrdClient.cmake
+--- xrootd-3.2.1.orig/src/XrdClient.cmake	2012-05-11 23:43:10.000000000 +0200
++++ xrootd-3.2.1/src/XrdClient.cmake	2012-05-17 07:36:01.676087690 +0200
 @@ -7,9 +7,6 @@
- set( XRD_CLIENT_VERSION   0.1.0 )
- set( XRD_CLIENT_SOVERSION 0 )
+ set( XRD_CLIENT_VERSION   1.0.0 )
+ set( XRD_CLIENT_SOVERSION 1 )
  
--set( XRD_CLIENT_ADMIN_VERSION   0.0.1 )
--set( XRD_CLIENT_ADMIN_SOVERSION 0 )
+-set( XRD_CLIENT_ADMIN_VERSION   1.0.0 )
+-set( XRD_CLIENT_ADMIN_SOVERSION 1 )
 -
  #-------------------------------------------------------------------------------
  # The XrdClient lib
diff --git a/xrootd.spec b/xrootd.spec
index 2a92310..cc574e4 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -4,7 +4,7 @@
 
 Name:		xrootd
 Epoch:		1
-Version:	3.1.1
+Version:	3.2.1
 Release:	1%{?dist}
 Summary:	Extended ROOT file server
 
@@ -24,11 +24,13 @@ BuildRequires:	krb5-devel
 BuildRequires:	openssl-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
-%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	fuse-devel
-%endif
 BuildRequires:	libxml2-devel
-BuildRequires:	perl(ExtUtils::Embed)
+%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:	perl-devel
+%else
+BuildRequires:	perl
+%endif
 BuildRequires:	java-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	swig
@@ -87,7 +89,6 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 This package contains the command line tools used to communicate with
 xrootd servers.
 
-%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5
 %package fuse
 Summary:	Xrootd FUSE tool
 Group:		Applications/Internet
@@ -96,7 +97,6 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 %description fuse
 This package contains the FUSE (file system in user space) xrootd mount
 tool.
-%endif
 
 %package client-admin-perl
 Summary:	Xrootd client administration Perl module
@@ -112,11 +112,7 @@ Perl module.
 Summary:	Xrootd client administration Java library
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5
 Requires:	java
-%else
-Requires:	java-1.4.2-gcj-compat
-%endif
 
 %description client-admin-java
 This package contains JNI bindings for doing xrootd client administration
@@ -162,12 +158,6 @@ pushd build
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Remove some junk
-%if %{?fedora}%{!?fedora:0} < 7 && %{?rhel}%{!?rhel:0} < 5
-rm $RPM_BUILD_ROOT%{_bindir}/xrootdfs
-rm $RPM_BUILD_ROOT%{_mandir}/man1/xrootdfs.1
-%endif
-
 # Perl module
 mkdir -p $RPM_BUILD_ROOT%{perl_vendorarch}/auto/XrdClientAdmin
 mv $RPM_BUILD_ROOT/%{_libdir}/XrdClientAdmin.pm \
@@ -199,13 +189,8 @@ install -p packaging/rhel/%{name}.init \
 
 sed s/%{name}.functions/%{name}-functions/ -i $RPM_BUILD_ROOT%{_initrddir}/*
 
-%if "%{?rhel}" == "4"
-install -m 644 -p packaging/rhel/%{name}.functions-slc4 \
-    $RPM_BUILD_ROOT%{_initrddir}/%{name}-functions
-%else
 install -m 644 -p packaging/rhel/%{name}.functions \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}-functions
-%endif
 
 sed -e 's/XROOTD_USER=daemon/XROOTD_USER=%{name}/g' \
     -e 's/XROOTD_GROUP=daemon/XROOTD_GROUP=%{name}/g' \
@@ -220,6 +205,11 @@ install -m 644 packaging/common/%{name}-standalone.cfg \
 
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdCmsNotify.pm
 
+sed 's!/usr/bin/env perl!/usr/bin/perl!' -i \
+    $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/netchk \
+    $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdCmsNotify.pm \
+    $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/XrdOlbMonPerf
+
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
 
@@ -352,12 +342,10 @@ fi
 %{_mandir}/man1/xrdgsiproxy.1*
 %{_mandir}/man1/xrdstagetool.1*
 
-%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5
 %files fuse
 %defattr(-,root,root,-)
 %{_bindir}/xrootdfs
 %{_mandir}/man1/xrootdfs.1*
-%endif
 
 %files client-admin-perl
 %defattr(-,root,root,-)
@@ -373,6 +361,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Thu May 17 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.2.1-1
+- Update to version 3.2.1
+
 * Sat Mar 17 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1:3.1.1-1
 - Update to version 3.1.1