From 3aa26cce302f93d10f5d12989e8f5ce2de514aa8 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Feb 27 2014 18:20:49 +0000
Subject: Update to 5.34.17


---

diff --git a/root-bsd-misc.patch b/root-bsd-misc.patch
new file mode 100644
index 0000000..b49fbba
--- /dev/null
+++ b/root-bsd-misc.patch
@@ -0,0 +1,12 @@
+diff -ur root-5.34.17.orig/core/base/src/TTimeStamp.cxx root-5.34.17/core/base/src/TTimeStamp.cxx
+--- root-5.34.17.orig/core/base/src/TTimeStamp.cxx	2014-02-24 09:37:53.000000000 +0100
++++ root-5.34.17/core/base/src/TTimeStamp.cxx	2014-02-27 09:37:28.381639337 +0100
+@@ -813,7 +813,7 @@
+           tmstruct.tm_isdst);
+ #if (defined(linux) && !defined(R__WINGCC)) || defined(R__MACOSX)
+    printf(",\n      tm_gmtoff %6ld, tm_zone \"%s\"",
+-#if defined(__USE_BSD) || defined(R__MACOSX)
++#if defined(__USE_MISC) || defined(R__MACOSX)
+    tmstruct.tm_gmtoff, tmstruct.tm_zone);
+ #else
+    tmstruct.__tm_gmtoff, tmstruct.__tm_zone);
diff --git a/root-includelist b/root-includelist
index cd7842c..3faece8 100644
--- a/root-includelist
+++ b/root-includelist
@@ -1,3 +1,4 @@
+include config/Makefile.config
 include $(MODULE)/Module.mk
 includelist:
 	@list=includelist-`tr / - <<< $(MODULE)` ; \
diff --git a/root.spec b/root.spec
index 1df6585..40a1b3c 100644
--- a/root.spec
+++ b/root.spec
@@ -42,7 +42,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.15
+Version:	5.34.17
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -86,6 +86,8 @@ Patch7:		%{name}-no-extra-formats.patch
 Patch8:		%{name}-hdfs.patch
 #		Don't link to libjvm (handled properly inside libhdfs)
 Patch9:		%{name}-dont-link-jvm.patch
+#		Avoid deprecated __USE_BSD
+Patch10:	%{name}-bsd-misc.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
@@ -1173,6 +1175,7 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -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 \
@@ -1563,8 +1566,7 @@ mv htmldoc ${RPM_BUILD_ROOT}%{_pkgdocdir}/html
 # Create includelist files ...
 for module in `find * -name Module.mk` ; do
     module=`dirname $module`
-    make -f %{SOURCE1} includelist MODULE=$module ROOT_SRCDIR=$PWD \
-	HASXRD=yes CRYPTOLIB=yes SSLLIB=yes
+    make -f %{SOURCE1} includelist MODULE=$module
 done
 
 # ... and merge some of them
@@ -2410,6 +2412,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Wed Feb 26 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.17-1
+- Update to 5.34.17
+
 * Fri Feb 14 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.15-1
 - Update to 5.34.15
 - Drop patch root-davix.patch