From 19572e72011886ee7730e6c7fe20f18e4c2c0683 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Nov 19 2011 18:36:28 +0000
Subject: Update to 5.30.04


---

diff --git a/root-xrootd.patch b/root-xrootd.patch
index 6fd328d..51d4ab4 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,7 +1,7 @@
-diff -ur root-5.30.00.orig/configure root-5.30.00/configure
---- root-5.30.00.orig/configure	2011-06-28 11:49:53.000000000 +0200
-+++ root-5.30.00/configure	2011-07-24 15:09:47.307270249 +0200
-@@ -4364,13 +4364,14 @@
+diff -ur root-5.30.04.orig/configure root-5.30.04/configure
+--- root-5.30.04.orig/configure	2011-11-08 14:28:55.000000000 +0100
++++ root-5.30.04/configure	2011-11-16 05:48:21.224144395 +0100
+@@ -4424,13 +4424,14 @@
      if test "x$externalxrd" = "xyes"; then
         buildxrd="no"
         # Check if bonjour is available for code potentially using it ...
@@ -23,13 +23,13 @@ diff -ur root-5.30.00.orig/configure root-5.30.00/configure
      fi
  else
      buildxrd="no"
-diff -ur root-5.30.00.orig/proof/proofd/Module.mk root-5.30.00/proof/proofd/Module.mk
---- root-5.30.00.orig/proof/proofd/Module.mk	2011-06-28 11:49:12.000000000 +0200
-+++ root-5.30.00/proof/proofd/Module.mk	2011-07-24 15:12:09.402270264 +0200
-@@ -127,12 +127,10 @@
- ifeq ($(HASXRD),yes)
- XPDINCEXTRA    := $(XROOTDDIRI:%=-I%)
+diff -ur root-5.30.04.orig/proof/proofd/Module.mk root-5.30.04/proof/proofd/Module.mk
+--- root-5.30.04.orig/proof/proofd/Module.mk	2011-11-08 14:28:15.000000000 +0100
++++ root-5.30.04/proof/proofd/Module.mk	2011-11-16 07:29:54.315314349 +0100
+@@ -129,12 +129,10 @@
  XPDINCEXTRA    += $(PROOFDDIRI:%=-I%)
+ ifeq ($(HASXRDUTILS),no)
+ 
 -XPDLIBEXTRA    += -L$(XROOTDDIRL) -lXrdOuc -lXrdNet -lXrdSys \
 -                  -lXrdClient -lXrdSut $(DNSSDLIB)
 -XPROOFDEXELIBS := $(XROOTDDIRL)/libXrd.a $(XROOTDDIRL)/libXrdClient.a \
@@ -43,7 +43,7 @@ diff -ur root-5.30.00.orig/proof/proofd/Module.mk root-5.30.00/proof/proofd/Modu
  # Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
  # both are needed
  XRDNETUTIL     :=
-@@ -142,8 +140,8 @@
+@@ -144,8 +142,8 @@
                            fi)
  endif
  ifeq ($(XRDNETUTIL),yes)
@@ -52,9 +52,9 @@ diff -ur root-5.30.00.orig/proof/proofd/Module.mk root-5.30.00/proof/proofd/Modu
 +XPDLIBEXTRA    += -lXrdNetUtil
 +XPROOFDEXELIBS += -lXrdNetUtil
  endif
- XPDLIBEXTRA    +=  $(DNSSDLIB)
  
-@@ -178,7 +176,7 @@
+ else
+@@ -191,10 +189,10 @@
  		$(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(GLBPATCHO) \
  		   $(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS)
  
@@ -62,4 +62,8 @@ diff -ur root-5.30.00.orig/proof/proofd/Module.mk root-5.30.00/proof/proofd/Modu
 +$(XPROOFDEXE):  $(XPDO) $(XRDPROOFXD) $(RPDCONNO)
  		$(LD) $(LDFLAGS) -o $@ $(XPDO) $(RPDCONNO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
  
- $(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD) $(RPDCONNO)
+-$(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(XPROOFDEXELIBS) $(MAINLIBS) $(XRDPROOFXD) $(RPDCONNO)
++$(XPDLIB):      $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD) $(RPDCONNO)
+ 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+ 		   "$(SOFLAGS)" libXrdProofd.$(SOEXT) $@ "$(XPDO) $(RPDCONNO)" \
+ 		   "$(XPDLIBEXTRA)"
diff --git a/root.spec b/root.spec
index aa4301d..fc31e45 100644
--- a/root.spec
+++ b/root.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name:		root
-Version:	5.30.03
+Version:	5.30.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -2286,7 +2286,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
-* Sat Oct 22 2011 Mattias Ellert <mattias.ellert@fysast,uu,se> - 5.30.03-1
+* Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
+- Update to 5.30.04
+
+* Sat Oct 22 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.03-1
 - Update to 5.30.03
 
 * Fri Sep 23 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.02-1
diff --git a/sources b/sources
index c332a98..27231d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-361d7a0e14a408ef196f97f3a31867ec  root-5.30.03.tar.gz
+9fe36a18b07119bdd02527fc5a2d2651  root-5.30.04.tar.gz