[nordugrid-arc/el5: 2/2] Rebuild for xrootd 3.3

[Mattias Ellert]

commit 51f4ee55be9b69dcf89ac384c8c7a6d5b9d3258a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Mar 8 17:42:33 2013 +0100

    Rebuild for xrootd 3.3

 nordugrid-arc-xrootd-private.patch |   38 ++++++++++++++++++++++++++++++++++++
 nordugrid-arc.spec                 |   10 +++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/nordugrid-arc-xrootd-private.patch b/nordugrid-arc-xrootd-private.patch
new file mode 100644
index 0000000..494119e
--- /dev/null
+++ b/nordugrid-arc-xrootd-private.patch
@@ -0,0 +1,38 @@
+diff -ur nordugrid-arc-2.0.1.orig/configure.ac nordugrid-arc-2.0.1/configure.ac
+--- nordugrid-arc-2.0.1.orig/configure.ac	2012-11-08 20:45:40.000000000 +0100
++++ nordugrid-arc-2.0.1/configure.ac	2013-03-08 16:23:06.547196169 +0100
+@@ -1533,11 +1533,11 @@
+ 
+ AC_ARG_ENABLE(xrootd, AC_HELP_STRING([--disable-xrootd], [disable the xrootd support, default is enable]),[enables_xrootd="$enableval"],[])
+ if test "x$enables_xrootd" = "xyes"; then
+-  XROOTD_CPPFLAGS="-I/usr/include/xrootd"
++  XROOTD_CPPFLAGS="-I/usr/include/xrootd -I/usr/include/xrootd/private"
+   AC_ARG_WITH(xrootd, [  --with-xrootd=(PATH) Xrootd location])
+   if test ! "x$with_xrootd" = "x" ; then
+     XROOTD_LOCATION="$with_xrootd"
+-    XROOTD_CPPFLAGS="-I$XROOTD_LOCATION/include/xrootd"
++    XROOTD_CPPFLAGS="-I$XROOTD_LOCATION/include/xrootd -I$XROOTD_LOCATION/include/xrootd/private"
+     if test -d $XROOTD_LOCATION/lib64; then
+       XROOTD_LDFLAGS="-L$XROOTD_LOCATION/lib64"
+     else
+diff -ur nordugrid-arc-2.0.1.orig/configure nordugrid-arc-2.0.1/configure
+--- nordugrid-arc-2.0.1.orig/configure	2012-11-08 20:45:50.000000000 +0100
++++ nordugrid-arc-2.0.1/configure	2013-03-08 16:24:07.837721638 +0100
+@@ -28764,7 +28764,7 @@
+ fi
+ 
+ if test "x$enables_xrootd" = "xyes"; then
+-  XROOTD_CPPFLAGS="-I/usr/include/xrootd"
++  XROOTD_CPPFLAGS="-I/usr/include/xrootd -I/usr/include/xrootd/private"
+ 
+ # Check whether --with-xrootd was given.
+ if test "${with_xrootd+set}" = set; then
+@@ -28773,7 +28773,7 @@
+ 
+   if test ! "x$with_xrootd" = "x" ; then
+     XROOTD_LOCATION="$with_xrootd"
+-    XROOTD_CPPFLAGS="-I$XROOTD_LOCATION/include/xrootd"
++    XROOTD_CPPFLAGS="-I$XROOTD_LOCATION/include/xrootd -I$XROOTD_LOCATION/include/xrootd/private"
+     if test -d $XROOTD_LOCATION/lib64; then
+       XROOTD_LDFLAGS="-L$XROOTD_LOCATION/lib64"
+     else
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index ee0f3b4..79458eb 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -54,13 +54,14 @@
 
 Name:		nordugrid-arc
 Version:	2.0.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Advanced Resource Connector Grid Middleware
 Group:		System Environment/Daemons
 License:	ASL 2.0
 URL:		http://www.nordugrid.org/
 Source:		http://download.nordugrid.org/packages/%{name}/releases/%{version}/src/%{name}-%{version}.tar.gz
 Patch0:		%{name}-swig-209.patch
+Patch1:		%{name}-xrootd-private.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Packages dropped without replacements
@@ -103,8 +104,9 @@ BuildRequires:	lfc-devel
 %endif
 BuildRequires:	gridsite-devel
 %if %{with_xrootd}
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	xrootd-client-devel
+BuildRequires:	xrootd-private-devel
 %else
 BuildRequires:	xrootd-devel
 %endif
@@ -528,6 +530,7 @@ fetch-crl tool in the fetch-crl package.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
 # Older versions of SELinux does not have policy for open
@@ -1168,6 +1171,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Mar 08 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.1-4
+- Rebuild for xrootd 3.3
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild