From 5c7ddcfdcd9c01ee51af75d2cca6819baa79f45a Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Apr 23 2011 19:02:17 +0000
Subject: Update to 5.28.00c


---

diff --git a/.gitignore b/.gitignore
index 5b51c62..e21344a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/root-5.28.00b.tar.gz
+/root-5.28.00c.tar.gz
diff --git a/root-xrootd.patch b/root-xrootd.patch
new file mode 100644
index 0000000..7e02e05
--- /dev/null
+++ b/root-xrootd.patch
@@ -0,0 +1,65 @@
+diff -ur root-5.28.00c.orig/configure root-5.28.00c/configure
+--- root-5.28.00c.orig/configure	2011-04-15 17:34:20.000000000 +0200
++++ root-5.28.00c/configure	2011-04-23 13:02:29.385052080 +0200
+@@ -4307,13 +4307,14 @@
+     if test "x$externalxrd" = "xyes"; then
+        buildxrd="no"
+        # Check if bonjour is available for code potentially using it ...
+-       if test "x$enable_bonjour" = "xyes"; then
+-          check_symbol XrdOucBonjour "libXrdOuc.a" "$xrdlibdir"
+-          if test  $found_symbol -eq 0 ; then
+-             bjrcomm="External xrootd has no bonjour support: disabling bonjour in XrdProofd"
+-             bonjourcppflags=
+-          fi
+-       fi
++       ## This test is broken and will always fail.
++       ##if test "x$enable_bonjour" = "xyes"; then
++       ##   check_symbol XrdOucBonjour "libXrdOuc.a" "$xrdlibdir"
++       ##   if test  $found_symbol -eq 0 ; then
++       ##      bjrcomm="External xrootd has no bonjour support: disabling bonjour in XrdProofd"
++       ##      bonjourcppflags=
++       ##   fi
++       ##fi
+     fi
+ else
+     buildxrd="no"
+diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Module.mk
+--- root-5.28.00c.orig/proof/proofd/Module.mk	2011-04-15 17:33:43.000000000 +0200
++++ root-5.28.00c/proof/proofd/Module.mk	2011-04-23 13:51:01.294607207 +0200
+@@ -115,12 +115,10 @@
+ ifeq ($(HASXRD),yes)
+ XPDINCEXTRA    := $(XROOTDDIRI:%=-I%)
+ XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
+-XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrdOuc -lXrdNet -lXrdSys \
+-                  -lXrdClient -lXrdSut $(DNSSDLIB)
+-XPROOFDEXELIBS := $(XROOTDDIRL)/libXrd.a $(XROOTDDIRL)/libXrdClient.a \
+-                  $(XROOTDDIRL)/libXrdNet.a \
+-                  $(XROOTDDIRL)/libXrdOuc.a \
+-                  $(XROOTDDIRL)/libXrdSys.a $(XROOTDDIRL)/libXrdSut.a
++XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrd -lXrdClient -lXrdSut \
++                  -lXrdNet -lXrdOuc -lXrdSys $(DNSSDLIB)
++XPROOFDEXELIBS := -L$(XROOTDDIRL) -lXrd -lXrdClient -lXrdSut \
++                  -lXrdNet -lXrdOuc -lXrdSys
+ # Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
+ # both are needed
+ XRDNETUTIL     :=
+@@ -130,8 +128,8 @@
+                           fi)
+ endif
+ ifeq ($(XRDNETUTIL),yes)
+-XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrdNetUtil
+-XPROOFDEXELIBS += $(XROOTDDIRL)/libXrdNetUtil.a
++XPDLIBEXTRA    += -lXrdNetUtil
++XPROOFDEXELIBS += -lXrdNetUtil
+ endif
+ XPDLIBEXTRA    +=  $(DNSSDLIB)
+ 
+@@ -166,7 +164,7 @@
+ 		$(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(GLBPATCHO) \
+ 		   $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS)
+ 
+-$(XPROOFDEXE):  $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD)
++$(XPROOFDEXE):  $(XPDO) $(XRDPROOFXD)
+ 		$(LD) $(LDFLAGS) -o $@ $(XPDO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
+ 
+ $(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD)
diff --git a/root.spec b/root.spec
index 973ca62..d3ae58d 100644
--- a/root.spec
+++ b/root.spec
@@ -18,9 +18,9 @@
 %endif
 
 Name:		root
-Version:	5.28.00b
+Version:	5.28.00c
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -51,6 +51,8 @@ Patch2:		%{name}-unuran.patch
 Patch3:		%{name}-cern-ppc.patch
 #		Fix an issue with the TGListBox height (backported from trunk)
 Patch4:		%{name}-listbox-height.patch
+#		Fixes for external xrootd
+Patch5:		%{name}-xrootd.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc64 during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
@@ -1013,6 +1015,7 @@ package to use root with GNU Emacs.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
 	   -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -1060,8 +1063,6 @@ sed 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' -i graf3d/gl/Module.mk
 rm -rf math/unuran/src/unuran-1.5.1-root.tar.gz
 #  * xrootd
 rm -rf net/xrootd/src
-sed -e 's!-lXrdOuc!-lXrd &!' \
-    -e 's!$(XROOTDDIRL)/lib\(Xrd\w*\).a!-l\1!g' -i proof/proofd/Module.mk
 
 # Remove unsupported man page macros
 sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/*
@@ -2119,7 +2120,10 @@ fi
 %{_datadir}/%{name}/plugins/TApplication/P010_TApplicationRemote.C
 %{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
 %{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
+%{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
+%{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
+%{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
 %{_datadir}/%{name}/plugins/TVirtualMonitoringWriter/P020_TSQLMonitoringWriter.C
 
 %files net-rpdutils -f includelist-net-rpdutils
@@ -2259,6 +2263,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Thu Apr 21 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00c-1
+- Update to 5.28.00c
+
 * Wed Mar 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.28.00b-2
 - Rebuild for mysql 5.5.10
 
diff --git a/sources b/sources
index f2c9108..ecd8f7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fee1bb33980196c861a3d7a063eb4c3e  root-5.28.00b.tar.gz
+5b1a4026fb1ca7fead157ec8e09872ff  root-5.28.00c.tar.gz