[root/f18] Update to 5.34.06

Mattias Ellert ellert at fedoraproject.org
Sat Apr 27 13:20:35 UTC 2013


commit 9820501d6a042cd272a86e77bcbaa1cf53d8096f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 27 15:14:01 2013 +0200

    Update to 5.34.06
    
    - Drop patches root-gviz.patch, root-ruby-version.patch,
      root-rev48681.patch and root-rev48831.patch

 root-gfal-bits.patch    |    4 +-
 root-gviz.patch         |  116 ---------
 root-rev48681.patch     |  199 ---------------
 root-rev48831.patch     |  619 -----------------------------------------------
 root-ruby-version.patch |   69 ------
 root.spec               |   27 +--
 sources                 |    2 +-
 7 files changed, 15 insertions(+), 1021 deletions(-)
---
diff --git a/root-gfal-bits.patch b/root-gfal-bits.patch
index edf424e..73df8c0 100644
--- a/root-gfal-bits.patch
+++ b/root-gfal-bits.patch
@@ -1,9 +1,9 @@
 diff -ur root-5.34.05.orig/io/gfal/Module.mk root-5.34.05/io/gfal/Module.mk
 --- root-5.34.05.orig/io/gfal/Module.mk	2013-02-14 23:27:54.000000000 +0100
 +++ root-5.34.05/io/gfal/Module.mk	2013-02-26 20:58:00.150088502 +0100
-@@ -71,3 +71,5 @@
+@@ -71,4 +71,5 @@
  $(GFALO) $(GFALDO): CXXFLAGS := $(filter-out -Wshadow,$(CXXFLAGS))
  $(GFALO): CXXFLAGS += $(GFALINCDIR:%=-I%)
  $(GFALO): CXXFLAGS += $(SRMIFCEINCDIR:%=-I%)
 +$(GFALO): CXXFLAGS += $(shell pkg-config --cflags glib-2.0)
-+$(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
+ $(GFALO): CXXFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/root.spec b/root.spec
index 4fe1b99..fc869dc 100644
--- a/root.spec
+++ b/root.spec
@@ -30,9 +30,9 @@
 %endif
 
 Name:		root
-Version:	5.34.05
+Version:	5.34.06
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -70,13 +70,6 @@ Patch5:		%{name}-gfal-bits.patch
 Patch6:		%{name}-thtml-revert.patch
 #		Don't save in all image formats:
 Patch7:		%{name}-no-extra-formats.patch
-#		Graphviz libgraph deprecated:
-Patch8:		%{name}-gviz.patch
-#		Don't use ruby_version - it is not portable 
-Patch9:		%{name}-ruby-version.patch
-#		Backport xrootd 3.3 support:
-Patch10:	%{name}-rev48681.patch
-Patch11:	%{name}-rev48831.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
@@ -1073,10 +1066,10 @@ fi
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p0
-%patch11 -p0
+#%patch8 -p1
+#%patch9 -p1
+#%patch10 -p0
+#%patch11 -p0
 
 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 \
@@ -2196,8 +2189,7 @@ fi
 %{_datadir}/%{name}/plugins/TApplication/P020_TApplicationServer.C
 %{_datadir}/%{name}/plugins/TFile/P010_TWebFile.C
 %{_datadir}/%{name}/plugins/TFile/P120_TNetFile.C
-%{_datadir}/%{name}/plugins/TFile/P130_TAS3File.C
-%{_datadir}/%{name}/plugins/TFile/P140_TGSFile.C
+%{_datadir}/%{name}/plugins/TFile/P150_TS3WebFile.C
 %{_datadir}/%{name}/plugins/TFileStager/P020_TNetFileStager.C
 %{_datadir}/%{name}/plugins/TSystem/P050_TWebSystem.C
 %{_datadir}/%{name}/plugins/TSystem/P070_TNetSystem.C
@@ -2337,6 +2329,11 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Sat Apr 27 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.06-1
+- Update to 5.34.06
+- Drop patches root-gviz.patch, root-ruby-version.patch,
+  root-rev48681.patch and root-rev48831.patch
+
 * Wed Mar 20 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.05-2
 - Rebuild for ruby 2.0
 - Rebuild for cfitsio 3.330
diff --git a/sources b/sources
index b0b813c..e1416ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dd415d539f5bb8ec21c9f49b2f9c5fd  root-5.34.05.tar.gz
+16c6a60c4a5361cf7ee6dfa4598dd3e8  root-5.34.06.tar.gz


More information about the scm-commits mailing list