diff --git a/root-gcc5-1.patch b/root-gcc5-1.patch
deleted file mode 100644
index ab826cb..0000000
--- a/root-gcc5-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 126c993d3c432ed09abc963bdbb1dc18f229a3e3 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:31:13 +0100
-Subject: [PATCH 1/1] Regenerate iosenum.linuxarm643 for GCC 5
-
-There are two `iosenum.cxx` in ROOT5 source. Previously I used
-`./cint/cint/include/iosenum.cxx` which also generated compiler
-version check. This breaks on GCC 5 based system (e.g, Fedora 22).
-
-This time used `./cint/iosenum/iosenum.cxx` to match the rest of
-`iosenum.h` files in source.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/iosenum/iosenum.linuxarm643 | 38 ++------------------------------------
- 1 file changed, 2 insertions(+), 36 deletions(-)
-
-diff --git a/cint/iosenum/iosenum.linuxarm643 b/cint/iosenum/iosenum.linuxarm643
-index 997f30b..0465c64 100644
---- a/cint/iosenum/iosenum.linuxarm643
-+++ b/cint/iosenum/iosenum.linuxarm643
-@@ -1,42 +1,8 @@
--/* include/iosenum.h
-+/* include/platform/iosenum.h
-  *  This file contains platform dependent ios enum value.
-- *  Run 'cint include/iosenum.cxx' to create this file. It is done
-+ *  Run 'cint iosenum.cxx' to create this file. It is done
-  *  only once at installation. */
--#if !defined(G__GNUC) || (G__GNUC!=4)
--#error $CINTSYSDIR/include/iosenum.h compiler version mismatch. Do'cd $CINTSYSDIR/include; cint iosenum.cxx' to restore
--#endif
- #pragma ifndef G__TMPLTIOS
--static int ios::goodbit=0;
--static int ios::eofbit=2;
--static int ios::failbit=4;
--static int ios::badbit=1;
--static int ios::in=8;
--static int ios::out=16;
--static int ios::ate=2;
--static int ios::app=1;
--static int ios::trunc=32;
--static int ios::binary=4;
--static int ios::beg=0;
--static int ios::cur=1;
--static int ios::end=2;
--static int ios::boolalpha=1;
--static int ios::adjustfield=176;
--static int ios::basefield=74;
--static int ios::floatfield=260;
--static int ios::skipws=4096;
--static int ios::left=32;
--static int ios::right=128;
--static int ios::internal=16;
--static int ios::dec=2;
--static int ios::oct=64;
--static int ios::hex=8;
--static int ios::showbase=512;
--static int ios::showpoint=1024;
--static int ios::uppercase=16384;
--static int ios::showpos=2048;
--static int ios::scientific=256;
--static int ios::fixed=4;
--static int ios::unitbuf=8192;
- #pragma else
- static ios_base::fmtflags ios_base::boolalpha=1;
- static ios_base::fmtflags ios_base::dec=2;
--- 
-1.8.2
-
diff --git a/root-gcc5-2.patch b/root-gcc5-2.patch
deleted file mode 100644
index 6343555..0000000
--- a/root-gcc5-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 7dec562d1d5723b7eea08d08659dc9dc4e79c8ca Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:35:47 +0100
-Subject: [PATCH 1/1] Update CINT CMake and configure scripts for GCC 5
-
-The following is required otherwise `iosenum.h` will be missing causing
-build failures. Needed for Fedora 22.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/cint/CMakeLists.txt |  4 +---
- cint/cint/Module.mk      | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/cint/cint/CMakeLists.txt b/cint/cint/CMakeLists.txt
-index 705b57d..e7756be 100644
---- a/cint/cint/CMakeLists.txt
-+++ b/cint/cint/CMakeLists.txt
-@@ -61,9 +61,7 @@ set_source_files_properties(loadfile_tmp.cxx  COMPILE_FLAGS "-UR__HAVE_CONFIG -D
- #---Generate and/or copy the iosenum headerfile to the include directory-------------------------------
- if(${CLANG_MAJOR} GREATER 2)
-   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
--elseif(${GCC_MAJOR} EQUAL 4)
--  set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
--elseif(${GCC_MAJOR} EQUAL 3)
-+elseif(${GCC_MAJOR} GREATER 3)
-   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE}3)
- else()
-   set(IOSENUM_H ${PROJECT_SOURCE_DIR}/cint/iosenum/iosenum.${ROOT_ARCHITECTURE})
-diff --git a/cint/cint/Module.mk b/cint/cint/Module.mk
-index 4cfed92..0293321 100644
---- a/cint/cint/Module.mk
-+++ b/cint/cint/Module.mk
-@@ -161,6 +161,10 @@ ifeq ($(GCC_MAJOR),4)
- CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
- CINTS2       += $(MODDIRSD)/gcc4strm.cxx
- endif
-+ifeq ($(GCC_MAJOR),5)
-+CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
-+CINTS2       += $(MODDIRSD)/gcc4strm.cxx
-+endif
- ifneq ($(CLANG_MAJOR),)
- CINTS2       := $(filter-out $(MODDIRSD)/libstrm.%,$(CINTS2))
- CINTS2       += $(MODDIRSD)/gcc4strm.cxx
-@@ -203,6 +207,9 @@ IOSENUMC     := $(CINTDIRIOSEN)/iosenum.cxx
- ifneq ($(CLANG_MAJOR),)
- IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
- else
-+ifeq ($(GCC_MAJOR),5)
-+IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
-+else
- ifeq ($(GCC_MAJOR),4)
- IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)3
- else
-@@ -213,6 +220,7 @@ IOSENUMA     := $(CINTDIRIOSEN)/iosenum.$(ARCH)
- endif
- endif
- endif
-+endif
- 
- # used in the main Makefile
- ALLHDRS     += $(CINTHT) $(CINTINCLUDES)
-@@ -344,6 +352,10 @@ $(call stripsrc,$(CINTDIRSD)/%strm.o):    CINTCXXFLAGS += -I$(CINTDIRL)/$(notdir
- ifeq ($(GCC_MAJOR),4)
- $(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
- endif
-+ifeq ($(GCC_MAJOR),5)
-+$(call stripsrc,$(CINTDIRSD)/gcc4strm.o): CINTCXXFLAGS += -Wno-strict-aliasing
-+endif
-+
- 
- $(MAKECINTO) $(CINTO): $(CINTCONF) $(ORDER_) $(CINTINCLUDES)
- 
--- 
-1.8.2
-
diff --git a/root-gcc5-3.patch b/root-gcc5-3.patch
deleted file mode 100644
index 740561e..0000000
--- a/root-gcc5-3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0a2381e82798f6fad2013d553c76b5f321b8a6a3 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:37:28 +0100
-Subject: [PATCH 1/1] Disable unsecure gets() in CINT as it's removed in C11
-
-gets() for a long time is considered unsafe, one could use fgets()
-instead. Also gets_s() could be used since C11. GCC 5 and Clang 3.6
-defaults to C11 as default now. glibc still provides gets() only
-if compiling for GNU specifically (_GNU_SOURCE is defined). Other
-libc implementations behavior is unknown to me.
-
-Required for Fedora 22.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/cint/lib/stdstrct/stdfunc.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cint/cint/lib/stdstrct/stdfunc.h b/cint/cint/lib/stdstrct/stdfunc.h
-index 530bc71..f849b13 100644
---- a/cint/cint/lib/stdstrct/stdfunc.h
-+++ b/cint/cint/lib/stdstrct/stdfunc.h
-@@ -70,7 +70,7 @@ size_t fwrite(void *buffer,size_t size,size_t n,FILE *fp);
- int getc(FILE *fp);
- int getchar(void);
- char *getenv(const char *variable);
--char *gets(char *buffer);
-+/* char *gets(char *buffer); */
- struct tm* gmtime(time_t *caltime);
- int isalnum(int c);
- int isalpha(int c);
--- 
-1.8.2
-
diff --git a/root-gcc5-4.patch b/root-gcc5-4.patch
deleted file mode 100644
index 14f8cd9..0000000
--- a/root-gcc5-4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 19f4cf3c144c4a2b6e2e758c601fc3976e9baa39 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <davidlt@cern.ch>
-Date: Wed, 11 Mar 2015 11:43:02 +0100
-Subject: [PATCH 1/1] Remove `operator void*() const` from CINT if compiled in
- C++11 mode (GCC 5)
-
-`std::basic_ios` had `operator void*() const` until C++11 and after that
-`explicit operator bool() const`. libstdc++ with GCC 5 finally cleans up
-things to be more compliant with C++11 standard. This is required if ROOT5
-is compiled in C++11 mode (--enable-c++11) on GCC 5.
-
-Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
----
- cint/cint/src/dict/gcc4strm.cxx | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/cint/cint/src/dict/gcc4strm.cxx b/cint/cint/src/dict/gcc4strm.cxx
-index 2bc8d43..4db0264 100644
---- a/cint/cint/src/dict/gcc4strm.cxx
-+++ b/cint/cint/src/dict/gcc4strm.cxx
-@@ -1047,11 +1047,14 @@ static int G__G__stream_13_0_8(G__value* result7, G__CONST char* funcname, struc
-    return(1 || funcname || hash || result7 || libp) ;
- }
- 
-+#if __cplusplus < 201103L
-+// operator void*() const is only available until C++11. Starting C++11 it's replaced with explicit operator bool() const
- static int G__G__stream_13_0_9(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
- {
-       G__letint(result7, 89, (long) ((const basic_ios<char,char_traits<char> >*) G__getstructoffset())->operator void*());
-    return(1 || funcname || hash || result7 || libp) ;
- }
-+#endif
- 
- static int G__G__stream_13_0_10(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
- {
-@@ -4097,7 +4100,10 @@ static void G__setup_memfuncbasic_ioslEcharcOchar_traitslEchargRsPgR(void) {
-    G__memfunc_setup("clear",519,G__G__stream_13_0_6, 121, -1, -1, 0, 1, 1, 1, 0, "i - 'ios_base::iostate' 0 'goodbit' state", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("setstate",877,G__G__stream_13_0_7, 121, -1, -1, 0, 1, 1, 1, 0, "i - 'ios_base::iostate' 0 - state", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("rdstate",759,G__G__stream_13_0_8, 105, -1, G__defined_typename("ios_base::iostate"), 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-+#if __cplusplus < 201103L
-+// operator void*() const is only available until C++11. Starting C++11 it's replaced with explicit operator bool() const
-    G__memfunc_setup("operator void*",1384,G__G__stream_13_0_9, 89, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-+#endif
-    G__memfunc_setup("operator!",909,G__G__stream_13_0_10, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("good",425,G__G__stream_13_0_11, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
-    G__memfunc_setup("eof",314,G__G__stream_13_0_12, 103, -1, -1, 0, 0, 1, 1, 8, "", (char*)NULL, (void*) NULL, 0);
--- 
-1.8.2
-
diff --git a/root-usa.patch b/root-usa.patch
index 4b5a380..d34da18 100644
--- a/root-usa.patch
+++ b/root-usa.patch
@@ -1,13 +1,15 @@
-diff -ur root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx root-5.34.19/hist/histpainter/src/THistPainter.cxx
---- root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx	2014-07-09 16:50:16.000000000 +0200
-+++ root-5.34.19/hist/histpainter/src/THistPainter.cxx	2014-07-26 23:01:20.083002118 +0200
-@@ -2305,7 +2305,8 @@
+diff -ur root-5.34.30.orig/hist/histpainter/src/THistPainter.cxx root-5.34.30/hist/histpainter/src/THistPainter.cxx
+--- root-5.34.30.orig/hist/histpainter/src/THistPainter.cxx	2015-04-23 18:30:25.000000000 +0200
++++ root-5.34.30/hist/histpainter/src/THistPainter.cxx	2015-04-24 20:05:03.349081003 +0200
+@@ -2367,7 +2367,10 @@
     TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2);
  
     TFile *f;
 -   f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   // f = TFile::Open("http://root.cern.ch/files/usa.root");
-+   f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root");
++   if (!gSystem->AccessPathName("$(ROOTSYS)/tutorials/hist/usa.root"))
++      f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root");
++   else
++      f = TFile::Open("http://root.cern.ch/files/usa.root");
  
     TMultiGraph *mg;
     TKey *key;
diff --git a/root.spec b/root.spec
index 6dd2cac..a559c1f 100644
--- a/root.spec
+++ b/root.spec
@@ -7,6 +7,10 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+%global py3soabi %(%{__python3} -c "from distutils import sysconfig; print(sysconfig.get_config_vars().get('SOABI'))" | sed -e 's/None//' -e 's/^..*$/\.&/')
+%endif
+
 %{!?ruby_sitearchdir: %global ruby_sitearchdir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' 2>/dev/null)}
 
 %if %{?fedora}%{!?fedora:0} >= 19 || %{?rhel}%{!?rhel:0} >= 7
@@ -25,10 +29,16 @@
 
 %global xrootd 1
 
+%if %{?fedora}%{!?fedora:0} >= 20 && %{?fedora}%{!?fedora:0} < 23
+%global hadoop 1
+%else
+%global hadoop 0
+%endif
+
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		root
-Version:	5.34.28
+Version:	5.34.30
 %global libversion %(cut -d. -f 1-2 <<< %{version})
 Release:	1%{?dist}
 Summary:	Numerical data analysis framework
@@ -74,11 +84,6 @@ Patch7:		%{name}-hdfs.patch
 Patch8:		%{name}-dont-link-jvm.patch
 #		Use local copy of input file during documentation generation
 Patch9:		%{name}-usa.patch
-#		Fixes for gcc 5 (from upstream git)
-Patch10:	%{name}-gcc5-1.patch
-Patch11:	%{name}-gcc5-2.patch
-Patch12:	%{name}-gcc5-3.patch
-Patch13:	%{name}-gcc5-4.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
@@ -128,6 +133,9 @@ BuildRequires:	python-devel
 %if %{?rhel}%{!?rhel:0} == 5
 BuildRequires:	python26-devel
 %endif
+%if %{?fedora}%{!?fedora:0} >= 15
+BuildRequires:	python3-devel
+%endif
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	qt4-devel
 %endif
@@ -149,7 +157,7 @@ BuildRequires:	cfitsio-devel
 BuildRequires:	davix-devel >= 0.2.8
 BuildRequires:	gfal2-devel
 BuildRequires:	srm-ifce-devel
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 BuildRequires:	hadoop-devel
 %endif
 BuildRequires:	emacs
@@ -383,6 +391,16 @@ This package contains the Python extension for ROOT. This package
 provide a Python interface to ROOT, and a ROOT interface to Python.
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+%package python3
+Summary:	Python extension for ROOT
+Group:		Applications/Engineering
+
+%description python3
+This package contains the Python extension for ROOT. This package
+provide a Python interface to ROOT, and a ROOT interface to Python.
+%endif
+
 %package ruby
 Summary:	Ruby extension for ROOT
 Group:		Applications/Engineering
@@ -652,7 +670,7 @@ Group:		Applications/Engineering
 %description io-gfal
 This package contains the Grid File Access Library extension for ROOT.
 
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 %package io-hdfs
 Summary:	Hadoop File System input/output library for ROOT
 Group:		Applications/Engineering
@@ -1139,10 +1157,6 @@ fi
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -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 \
@@ -1209,6 +1223,9 @@ sed '/CopyFileFromEtcDir("ROOT.css");/a\
    CopyFileFromEtcDir("root-banner.png");\
    CopyFileFromEtcDir("rootdrawing-logo.png");' -i html/src/THtml.cxx
 
+# Use local copy of input file during documentation generation
+install -p -m 644 %{SOURCE6} tutorials/hist/usa.root
+
 # Rename canvases to avoid name conflicts during doc generation
 sed s/c1/c1c/g -i tutorials/graphics/earth.C
 sed s/c3/c3c/g -i tutorials/graphs/multipalette.C
@@ -1221,6 +1238,13 @@ sed -e 's/= pyroot/= pyroot26/' -e 's/python /python26 /' \
     -i bindings/pyroot26/Module.mk
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+# Build PyROOT for python 3
+cp -pr bindings/pyroot bindings/pyroot3
+sed -e 's/= pyroot/= pyroot3/' -e 's/python /python3 /' \
+    -i bindings/pyroot3/Module.mk
+%endif
+
 %build
 unset QTDIR
 unset QTLIB
@@ -1241,9 +1265,23 @@ unset QTINC
 	    --disable-builtin-lzma \
 	    --disable-builtin-pcre \
 	    --disable-builtin-zlib \
+	    --disable-afdsmgrd \
+	    --disable-afs \
+	    --disable-alien \
+	    --disable-alloc \
 	    --enable-asimage \
 	    --enable-astiff \
 	    --enable-bonjour \
+	    --disable-castor \
+	    --disable-chirp \
+%ifarch %{ix86} x86_64
+	    --enable-cintex \
+%else
+	    --disable-cintex \
+%endif
+	    --disable-cling \
+	    --disable-cxx11 \
+	    --disable-cxx14 \
 	    --enable-davix \
 	    --enable-dcache \
 	    --enable-explicitlink \
@@ -1252,10 +1290,11 @@ unset QTINC
 	    --enable-gdml \
 	    --enable-genvector \
 	    --enable-gfal \
+	    --disable-glite \
 	    --enable-globus \
 	    --enable-gsl-shared \
 	    --enable-gviz \
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 	    --enable-hdfs \
 %else
 	    --disable-hdfs \
@@ -1263,19 +1302,23 @@ unset QTINC
 	    --enable-http \
 	    --enable-krb5 \
 	    --enable-ldap \
+	    --disable-libcxx \
 	    --enable-mathmore \
 	    --enable-memstat \
 	    --enable-minuit2 \
+	    --disable-monalisa \
 	    --enable-mysql \
 	    --enable-odbc \
 	    --enable-opengl \
+	    --disable-oracle \
 	    --enable-pgsql \
-	    --enable-python \
+	    --disable-pythia6 \
 %if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
 	    --enable-pythia8 \
 %else
 	    --disable-pythia8 \
 %endif
+	    --enable-python \
 %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 	    --enable-qt \
 	    --enable-qtgsi \
@@ -1286,16 +1329,21 @@ unset QTINC
 	    --enable-reflex \
 	    --enable-rfio \
 	    --enable-roofit \
+	    --disable-rpath \
 	    --enable-ruby \
+	    --disable-sapdb \
 	    --enable-shadowpw \
 	    --enable-shared \
 	    --enable-soversion \
 	    --enable-sqlite \
+	    --disable-srp \
 	    --enable-ssl \
 	    --enable-table \
 	    --enable-tmva \
 	    --enable-unuran \
+	    --disable-vc \
 	    --enable-vdt \
+	    --disable-werror \
 	    --enable-x11 \
 	    --enable-xft \
 	    --enable-xml \
@@ -1304,30 +1352,6 @@ unset QTINC
 %else
 	    --disable-xrootd \
 %endif
-%ifarch %{ix86} x86_64
-	    --enable-cintex \
-%else
-	    --disable-cintex \
-%endif
-	    --disable-afdsmgrd \
-	    --disable-afs \
-	    --disable-alien \
-	    --disable-alloc \
-	    --disable-castor \
-	    --disable-chirp \
-	    --disable-cling \
-	    --disable-cxx11 \
-	    --disable-cxx14 \
-	    --disable-glite \
-	    --disable-libcxx \
-	    --disable-monalisa \
-	    --disable-oracle \
-	    --disable-pythia6 \
-	    --disable-rpath \
-	    --disable-sapdb \
-	    --disable-srp \
-	    --disable-vc \
-	    --disable-werror \
 	    --fail-on-missing
 
 make OPTFLAGS="%{optflags}" \
@@ -1346,6 +1370,20 @@ make OPTFLAGS="%{optflags}" \
 	ROOTPY="pyroot26/ROOT.py pyroot26/cppyy.py"
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+# Build PyROOT for python 3
+mkdir pyroot3
+cp bindings/pyroot3/ROOT.py pyroot3
+cp bindings/pyroot3/cppyy.py pyroot3
+make OPTFLAGS="%{optflags}" \
+	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
+	MODULES="build cint/cint core/utils bindings/pyroot3" \
+	PYTHONINCDIR=`pkg-config --cflags python3 | sed 's/-I//'` \
+	PYTHONLIB=`pkg-config --libs python3` \
+	PYROOTLIB=pyroot3/libPyROOT.so \
+	ROOTPY="pyroot3/ROOT.py pyroot3/cppyy.py"
+%endif
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -1418,6 +1456,14 @@ install -m 644 pyroot26/ROOT.py* %{buildroot}%{python26_sitearch}
 install -m 644 pyroot26/cppyy.py* %{buildroot}%{python26_sitearch}
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+mkdir -p %{buildroot}%{python3_sitearch}
+install pyroot3/libPyROOT.so.%{libversion} \
+   %{buildroot}%{python3_sitearch}/libPyROOT%{py3soabi}.so
+install -m 644 pyroot3/ROOT.py* %{buildroot}%{python3_sitearch}
+install -m 644 pyroot3/cppyy.py* %{buildroot}%{python3_sitearch}
+%endif
+
 # Same for the Ruby interface library
 mkdir -p %{buildroot}%{ruby_installdir}
 mv %{buildroot}%{_libdir}/%{name}/libRuby.so.%{libversion} \
@@ -1479,7 +1525,7 @@ rm TDataSetManager/P020_TDataSetManagerAliEn.C
 rm TFile/P030_TCastorFile.C
 rm TFile/P060_TChirpFile.C
 rm TFile/P070_TAlienFile.C
-%if %{?fedora}%{!?fedora:0} < 20
+%if %{hadoop} == 0
 rm TFile/P110_THDFSFile.C
 %endif
 rm TGLManager/P020_TGWin32GLManager.C
@@ -1493,7 +1539,7 @@ rm TImagePlugin/P010_TASPluginGS.C
 rm TSQLServer/P030_TSapDBServer.C
 rm TSQLServer/P040_TOracleServer.C
 rm TSystem/P030_TAlienSystem.C
-%if %{?fedora}%{!?fedora:0} < 20
+%if %{hadoop} == 0
 rm TSystem/P060_THDFSSystem.C
 %endif
 rm TViewerX3D/P020_TQtViewerX3D.C
@@ -1529,7 +1575,6 @@ echo Cint.Includes: 0 >> .rootrc
 echo Root.StacktraceScript: ${PWD}/etc/gdb-backtrace.sh >> .rootrc
 echo Gui.MimeTypeFile: ${PWD}/etc/root.mimes >> .rootrc
 sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C
-install -m 644 -p %{SOURCE6} tutorials/hist/usa.root
 LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \
 ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C
 rm .rootrc
@@ -1609,7 +1654,7 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service proofd condrestart >/dev/null 2>&1 || :
 fi
 
-%if %{?rhel}%{!?rhel:0} == 5
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} == 5
 %post python
 [ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
     readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
@@ -1619,14 +1664,17 @@ fi
     libPyROOT.so %{python_sitearch}/libPyROOT.so 20
 /sbin/ldconfig
 
-%postun python -p /sbin/ldconfig
-
 %preun python
 if [ $1 = 0 ]; then
     %{_sbindir}/update-alternatives --remove \
 	libPyROOT.so %{python_sitearch}/libPyROOT.so
 fi
+%else
+%post python -p /sbin/ldconfig
+%endif
+%postun python -p /sbin/ldconfig
 
+%if %{?rhel}%{!?rhel:0} == 5
 %post python26
 [ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
     readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
@@ -1643,9 +1691,25 @@ if [ $1 = 0 ]; then
 fi
 
 %postun python26 -p /sbin/ldconfig
-%else
-%post python -p /sbin/ldconfig
-%postun python -p /sbin/ldconfig
+%endif
+
+%if %{?fedora}%{!?fedora:0} >= 15
+%post python3
+[ -h %{_libdir}/%{name}/libPyROOT.so.%{libversion} ] && \
+    readlink %{_libdir}/%{name}/libPyROOT.so.%{libversion} | \
+    grep -q site-packages && rm %{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%{_sbindir}/update-alternatives --install \
+    %{_libdir}/%{name}/libPyROOT.so.%{libversion} \
+    libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so 10
+/sbin/ldconfig
+
+%preun python3
+if [ $1 = 0 ]; then
+    %{_sbindir}/update-alternatives --remove \
+	libPyROOT.so %{python3_sitearch}/libPyROOT%{py3soabi}.so
+fi
+
+%postun python3 -p /sbin/ldconfig
 %endif
 
 %post core -p /sbin/ldconfig
@@ -1728,7 +1792,7 @@ fi
 %postun io-dcache -p /sbin/ldconfig
 %post io-gfal -p /sbin/ldconfig
 %postun io-gfal -p /sbin/ldconfig
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 %post io-hdfs -p /sbin/ldconfig
 %postun io-hdfs -p /sbin/ldconfig
 %endif
@@ -1954,7 +2018,7 @@ fi
 %{_initrddir}/rootd
 
 %files python -f includelist-bindings-pyroot
-%if %{?rhel}%{!?rhel:0} == 5
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} == 5
 %{_libdir}/%{name}/libPyROOT.rootmap
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.5
@@ -1962,7 +2026,7 @@ fi
 %else
 %{_libdir}/%{name}/libPyROOT.*
 %endif
-%{python_sitearch}/libPyROOT.*
+%{python_sitearch}/libPyROOT.so
 %{python_sitearch}/ROOT.py*
 %{python_sitearch}/cppyy.py*
 
@@ -1972,11 +2036,23 @@ fi
 %{_libdir}/%{name}/libPyROOT.so
 %{_libdir}/%{name}/libPyROOT.so.5
 %ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
-%{python26_sitearch}/libPyROOT.*
+%{python26_sitearch}/libPyROOT.so
 %{python26_sitearch}/ROOT.py*
 %{python26_sitearch}/cppyy.py*
 %endif
 
+%if %{?fedora}%{!?fedora:0} >= 15
+%files python3 -f includelist-bindings-pyroot
+%{_libdir}/%{name}/libPyROOT.rootmap
+%{_libdir}/%{name}/libPyROOT.so
+%{_libdir}/%{name}/libPyROOT.so.5
+%ghost %{_libdir}/%{name}/libPyROOT.so.%{libversion}
+%{python3_sitearch}/libPyROOT%{py3soabi}.so
+%{python3_sitearch}/ROOT.py
+%{python3_sitearch}/cppyy.py
+%{python3_sitearch}/__pycache__
+%endif
+
 %files ruby -f includelist-bindings-ruby
 %{_libdir}/%{name}/libRuby.*
 %{ruby_installdir}/libRuby.*
@@ -2144,7 +2220,7 @@ fi
 %{_libdir}/%{name}/libGFAL.*
 %{_datadir}/%{name}/plugins/TFile/P050_TGFALFile.C
 
-%if %{?fedora}%{!?fedora:0} >= 20
+%if %{hadoop}
 %files io-hdfs -f includelist-io-hdfs
 %{_libdir}/%{name}/libHDFS.*
 %{_datadir}/%{name}/plugins/TFile/P110_THDFSFile.C
@@ -2401,6 +2477,12 @@ fi
 %{_datadir}/%{name}/plugins/TVirtualTreeViewer/P010_TTreeViewer.C
 
 %changelog
+* Fri Apr 24 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.30-1
+- Update to 5.34.30
+- New sub-package: root-python3
+- Disable hadoop/hdfs support for F23+ (not installable)
+- Drop previously backported gcc 5 patches
+
 * Fri Apr 03 2015 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.34.28-1
 - Update to 5.34.28
 - Merge emacs support files into main package (guidelines updated)
diff --git a/sources b/sources
index eb2cd1b..696318d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-87647e87b2ab5634759e0efe99ec1543  root-5.34.28.tar.xz
+a28f5c9713ff920ac8069975f32d391c  root-5.34.30.tar.xz
 afb35390554c43a7d92576a6d9d3ae8a  usa.root