From 530201be85b58d04cd2ff023ea63eb88e2fa44b5 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Mon, 13 Feb 2012 14:46:44 +0100
Subject: [PATCH] Update to 5.30.06

---
 root-cern-ppc.patch | 11 -----------
 root-includelist    | 10 ++++------
 root.spec           | 17 +++++++++--------
 sources             |  2 +-
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 root-cern-ppc.patch

diff --git a/root-cern-ppc.patch b/root-cern-ppc.patch
deleted file mode 100644
index dfba748..0000000
--- a/root-cern-ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root-5.26.00d.orig/tutorials/tree/cernbuild.C	2010-08-29 10:20:56.069801363 +0200
-+++ root-5.26.00d/tutorials/tree/cernbuild.C	2010-08-29 15:52:51.000000000 +0200
-@@ -22,7 +22,7 @@
-    TString dir = gSystem->UnixPathName(gInterpreter->GetCurrentMacroName());
-    dir.ReplaceAll("cernbuild.C","");
-    dir.ReplaceAll("/./","/");
--   FILE *fp = fopen(Form("%scernstaff.dat",dir.Data()),"r");
-+   FILE *fp = fopen((dir+"cernstaff.dat").Data(),"r");
- 
-    TFile *hfile = 0;
-    if (get) {
diff --git a/root-includelist b/root-includelist
index 0eccf90..cd7842c 100644
--- a/root-includelist
+++ b/root-includelist
@@ -3,11 +3,9 @@ includelist:
 	@list=includelist-`tr / - <<< $(MODULE)` ; \
 	rm -f $$list ; \
 	for h in $(filter-out %.cw %.pri, $(ALLHDRS)) ; do \
-	    if [ "$(MODULE)" = "cint/cint7" ] ; then \
-		sed 's!^include!%{_includedir}/%{name}/cint7!' <<< $$h >> $$list ; \
-	    else \
-		sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
-	    fi ; \
+	    sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \
+	done ; \
+	if [ -r $$list ] ; then \
 	    sort -u $$list > $$list.unique ; \
 	    mv $$list.unique $$list ; \
-	done
+	fi
diff --git a/root.spec b/root.spec
index fc31e45..07e8df1 100644
--- a/root.spec
+++ b/root.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name:		root
-Version:	5.30.04
+Version:	5.30.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -48,9 +48,7 @@ Patch1:		%{name}-fontconfig.patch
 #		Use system unuran:
 Patch2:		%{name}-unuran.patch
 #		Workaround for broken Form() on ppc
-Patch3:		%{name}-cern-ppc.patch
-#		Fixes for external xrootd
-Patch4:		%{name}-xrootd.patch
+Patch3:		%{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
@@ -107,6 +105,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	globus-gss-assist-devel
 BuildRequires:	globus-gsi-credential-devel
 BuildRequires:	globus-proxy-utils
+BuildRequires:	libtool-ltdl-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	dcap-devel
 BuildRequires:	dpm-devel
@@ -299,7 +298,7 @@ provide a Python interface to ROOT, and a ROOT interface to Python.
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
 Provides:	ruby(libRuby) = %{version}
-requires:	ruby(abi) = 1.8
+Requires:	ruby(abi) = 1.8
 
 %description ruby
 This package contains the Ruby extension for ROOT. The interface
@@ -1018,13 +1017,12 @@ package to use root with GNU Emacs.
 
 %prep
 %setup -q
-%if %(pkg-config --max-version 2.1.2 ftgl 2>/dev/null && echo 1 || echo 0)
+if pkg-config --max-version 2.1.2 ftgl ; then
 %patch0 -p1
-%endif
+fi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -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 \
@@ -2286,6 +2284,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Mon Feb 13 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.06-1
+- Update to 5.30.06
+
 * Wed Nov 16 2011 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.30.04-1
 - Update to 5.30.04
 
diff --git a/sources b/sources
index 27231d4..b43c23e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe36a18b07119bdd02527fc5a2d2651  root-5.30.04.tar.gz
+0a0e24e890f33b3606f8983fe8765a09  root-5.30.06.tar.gz