The package rpms/root.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/root.git/commit/?id=b8c8500439123....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit b8c850043912306ac61bb3069c9a6f47ef0ddfbd
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Fri Feb 15 12:57:22 2019 +0100
Update to 6.16.00
Drop patches accepted upstream:
root-adjust-allowed-test-difference-for-32-bit-ix86.patch
root-crypto.patch
root-js-syntax.patch
root-missing-header.patch
root-set-cache-file-dir.patch
root-stressgraphics-ref.patch
root-test-compilation-epel7.patch
root-test-subdirs.patch
root-unique-filenames.patch
Dropped subpackages:
root-rootd (obsolete - use xrootd)
root-proofd (obsolete - use root-xproofd)
root-proof-pq2
New ROOT 7 subpackage:
root-graf3d-eve7
root-gui-webgui6
Make tutorial/v7/line.cxx run in batch mode
diff --git a/proofd.service b/proofd.service
deleted file mode 100644
index 4972553..0000000
--- a/proofd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=PROOF (The Parallel ROOT Facility)
-Documentation=man:proofd(8)
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/proofd
-ExecStart=/usr/bin/proofd $PROOFDOPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/root-32bit-dataframe.patch b/root-32bit-dataframe.patch
new file mode 100644
index 0000000..250d947
--- /dev/null
+++ b/root-32bit-dataframe.patch
@@ -0,0 +1,124 @@
+diff -ur root-6.16.00.orig/bindings/pyroot/ROOT.py root-6.16.00/bindings/pyroot/ROOT.py
+--- root-6.16.00.orig/bindings/pyroot/ROOT.py 2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/bindings/pyroot/ROOT.py 2019-02-12 03:57:19.824223542 +0100
+@@ -379,9 +379,7 @@
+ else:
+ return reshaped_matrix_np
+
+-# This Pythonisation is there only for 64 bits builds
+-if (sys.maxsize > 2**32): #
https://docs.python.org/3/library/platform.html#cross-platform
+- _root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
++_root.CreateScopeProxy( "TTree" ).AsMatrix = _TTreeAsMatrix
+
+
+ ### RINT command emulation ------------------------------------------------------
+diff -ur root-6.16.00.orig/bindings/pyroot/test/CMakeLists.txt
root-6.16.00/bindings/pyroot/test/CMakeLists.txt
+--- root-6.16.00.orig/bindings/pyroot/test/CMakeLists.txt 2019-01-23 09:23:37.000000000
+0100
++++ root-6.16.00/bindings/pyroot/test/CMakeLists.txt 2019-02-11 19:30:17.443068631 +0100
+@@ -4,9 +4,6 @@
+ ROOT_ADD_PYUNITTEST(pyroot_rvec rvec.py)
+ if(NUMPY_FOUND)
+ ROOT_ADD_PYUNITTEST(pyroot_array_interface array_interface.py)
+- # this excludes RDF for 32 bits builds because of clang/gcc abi issues
+- if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+- ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
+- endif()
++ ROOT_ADD_PYUNITTEST(pyroot_ttree_asmatrix ttree_asmatrix.py)
+ endif()
+
+diff -ur root-6.16.00.orig/build/unix/makepchinput.py
root-6.16.00/build/unix/makepchinput.py
+--- root-6.16.00.orig/build/unix/makepchinput.py 2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/build/unix/makepchinput.py 2019-02-12 04:01:47.071320473 +0100
+@@ -261,9 +261,6 @@
+ "math/vdt",
+ "tmva/rmva"]
+
+- if (sys.platform != 'win32' and sys.maxsize <= 2**32): #
https://docs.python.org/3/library/platform.html#cross-platform
+- PCHPatternsBlacklist.append("tree/dataframe")
+-
+ accepted = isAnyPatternInString(PCHPatternsWhitelist,dirName) and \
+ not isAnyPatternInString(PCHPatternsBlacklist,dirName)
+
+diff -ur root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in
root-6.16.00/cmake/scripts/ROOTConfig.cmake.in
+--- root-6.16.00.orig/cmake/scripts/ROOTConfig.cmake.in 2019-01-23 09:23:37.000000000
+0100
++++ root-6.16.00/cmake/scripts/ROOTConfig.cmake.in 2019-02-11 19:42:40.603045735 +0100
+@@ -83,7 +83,7 @@
+ set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+ endif()
+-foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame Tree TreePlayer Rint
Postscript Matrix Physics MathCore Thread MultiProc ${ROOT_FIND_COMPONENTS})
++foreach(_cpt Core Imt RIO Net Hist Graf Graf3d Gpad ROOTDataFrame ROOTVecOps Tree
TreePlayer Rint Postscript Matrix Physics MathCore Thread MultiProc
${ROOT_FIND_COMPONENTS})
+ find_library(ROOT_${_cpt}_LIBRARY ${_cpt} HINTS ${ROOT_LIBRARY_DIR})
+ if(ROOT_${_cpt}_LIBRARY)
+ mark_as_advanced(ROOT_${_cpt}_LIBRARY)
+diff -ur root-6.16.00.orig/config/root-config.in root-6.16.00/config/root-config.in
+--- root-6.16.00.orig/config/root-config.in 2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/config/root-config.in 2019-02-11 19:42:38.951063533 +0100
+@@ -72,15 +72,10 @@
+ newlib="-lNew"
+ rootglibs="-lGui"
+ rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
+-rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps
-lTree -lTreePlayer\
++rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTDataFrame
-lROOTVecOps-lTree -lTreePlayer\
+ -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread\
+ -lMultiProc"
+
+-if [ `uname -m` != 'i686' ]; then
+- rootlibs="$rootlibs -lROOTDataFrame"
+-fi
+-
+-
+ if test "$platform" = "win32"; then
+ rootulibs="-include:_G__cpp_setupG__Net \
+ -include:_G__cpp_setupG__IO \
+diff -ur root-6.16.00.orig/tree/dataframe/CMakeLists.txt
root-6.16.00/tree/dataframe/CMakeLists.txt
+--- root-6.16.00.orig/tree/dataframe/CMakeLists.txt 2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tree/dataframe/CMakeLists.txt 2019-02-11 19:26:43.236382519 +0100
+@@ -3,11 +3,6 @@
+ # @author Danilo Piparo CERN, Pere Mato CERN
+ ############################################################################
+
+-# Disable RDataFrame on 32-bit UNIX platforms due to ROOT-9236
+-if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+- return()
+-endif()
+-
+ if(arrow)
+ list(APPEND RDATAFRAME_EXTRA_HEADERS ROOT/RArrowDS.hxx)
+ list(APPEND RDATAFRAME_EXTRA_INCLUDES -I${ARROW_INCLUDE_DIR})
+diff -ur root-6.16.00.orig/tutorials/CMakeLists.txt
root-6.16.00/tutorials/CMakeLists.txt
+--- root-6.16.00.orig/tutorials/CMakeLists.txt 2019-01-23 09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/CMakeLists.txt 2019-02-11 19:29:09.215805630 +0100
+@@ -207,10 +207,6 @@
+ )
+ endif()
+
+-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+- set(bits32_veto dataframe/*.C graphs/timeSeriesFrom*.C)
+-endif()
+-
+ #---These ones are disabled !!! ------------------------------------
+ set(extra_veto
+ htmlex.C
+@@ -262,7 +258,6 @@
+ ${classic_veto}
+ ${pythia_veto}
+ ${root7_veto}
+- ${bits32_veto}
+ ${xrootd_veto}
+ )
+
+@@ -418,13 +413,6 @@
+
+ list(REMOVE_ITEM pytutorials ${pyveto})
+
+- if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
+- set(bits32_veto_py dataframe/*.py)
+- file(GLOB bits32_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} dataframe/*.py)
+- list(REMOVE_ITEM pytutorials ${bits32_veto_py})
+- list(REMOVE_ITEM pytutorials pyroot/pyroot002_TTreeAsMatrix.py)
+- endif()
+-
+ #---Python tutorials dependencies--------------------------------------
+ set(pyroot-ntuple1-depends tutorial-pyroot-hsimple-py)
+ set(pyroot-h1draw-depends tutorial-pyroot-hsimple-py)
diff --git a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
index c5d0b59..5cf51c2 100644
--- a/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
+++ b/root-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
@@ -21,4 +21,3 @@ diff -ur
root-6.14.00.orig/interpreter/llvm/src/lib/Target/PowerPC/PPCISelLoweri
if (Op1VT.bitsGT(mVT)) {
int Shift = Op1VT.getSizeInBits() - mVT.getSizeInBits();
BSwapOp = DAG.getNode(ISD::SRL, dl, Op1VT, BSwapOp,
-Endast i root-6.14.00/interpreter/llvm/src: test
diff --git a/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
b/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
deleted file mode 100644
index b7aa84d..0000000
--- a/root-adjust-allowed-test-difference-for-32-bit-ix86.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e363a175b96bbd1d24f5b4030192b8fb4b525681 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Fri, 29 Jun 2018 09:43:01 +0200
-Subject: [PATCH] Adjust allowed test difference for 32-bit ix86
-
----
- math/mathmore/test/VavilovTest.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/math/mathmore/test/VavilovTest.cxx b/math/mathmore/test/VavilovTest.cxx
-index f99e8291046..d5020f8a386 100644
---- a/math/mathmore/test/VavilovTest.cxx
-+++ b/math/mathmore/test/VavilovTest.cxx
-@@ -886,7 +886,7 @@ void VavilovTest::GetCdfTestParams (const Vavilov& v, double&
maxabsdiff, double
- }
- else {
- maxabsdiff = 1E-5;
-- maxcdfdiff = 5E-15;
-+ maxcdfdiff = 7E-15;
- }
- }
-
diff --git a/root-crypto.patch b/root-crypto.patch
deleted file mode 100644
index 82462c8..0000000
--- a/root-crypto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 40ffee7443df59a9702be993839fe6d7c3a6c1f1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Fri, 3 Aug 2018 11:05:24 +0200
-Subject: [PATCH] Add missing libcrypto for undefined references
-
----
- net/rootd/CMakeLists.txt | 3 ++-
- net/rpdutils/CMakeLists.txt | 5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/net/rootd/CMakeLists.txt b/net/rootd/CMakeLists.txt
-index 67d1cd05f1b..bc49e5611f7 100644
---- a/net/rootd/CMakeLists.txt
-+++ b/net/rootd/CMakeLists.txt
-@@ -4,6 +4,7 @@
- ############################################################################
-
- ROOT_EXECUTABLE(rootd *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c
-- LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES})
-+ LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}
-+ BUILTINS OPENSSL)
-
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../rpdutils/res)
-diff --git a/net/rpdutils/CMakeLists.txt b/net/rpdutils/CMakeLists.txt
-index 6a66e4aee7f..ac427424193 100644
---- a/net/rpdutils/CMakeLists.txt
-+++ b/net/rpdutils/CMakeLists.txt
-@@ -40,5 +40,6 @@ set_property(TARGET rpdutil PROPERTY POSITION_INDEPENDENT_CODE ON)
- add_dependencies(rpdutil move_headers)
-
- ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx ssh.cxx
-- LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} DEPENDENCIES Net)
--
-+ LIBRARIES rpdutil rsa ${GLOBUS_LIBRARIES} ${OPENSSL_LIBRARIES}
-+ DEPENDENCIES Net
-+ BUILTINS OPENSSL)
diff --git a/root-doc-no-notebooks.patch b/root-doc-no-notebooks.patch
index d2b3625..23ca293 100644
--- a/root-doc-no-notebooks.patch
+++ b/root-doc-no-notebooks.patch
@@ -1,13 +1,12 @@
-diff -ur root-6.08.02.orig/documentation/doxygen/filter.cxx
root-6.08.02/documentation/doxygen/filter.cxx
---- root-6.08.02.orig/documentation/doxygen/filter.cxx 2016-12-03 00:07:29.000000000
+0100
-+++ root-6.08.02/documentation/doxygen/filter.cxx 2016-12-06 20:59:12.642635390 +0100
-@@ -306,18 +306,9 @@
+--- root-6.16.00.orig/documentation/doxygen/filter.cxx 2019-02-14 14:44:47.132678348
+0100
++++ root-6.16.00/documentation/doxygen/filter.cxx 2019-02-14 14:45:00.596532589 +0100
+@@ -367,16 +367,7 @@
// notebook found
if (gLineString.find("\\notebook") != string::npos) {
-- ExecuteCommand(StringFormat("python converttonotebook.py %s
%s/notebooks/",
+- ExecuteCommand(StringFormat("%s converttonotebook.py %s
%s/notebooks/",
+- gPythonExec.c_str(),
- gFileName.c_str(), gOutDir.c_str()));
--
- if (gPython){
- gLineString = "## ";
- }
@@ -15,10 +14,7 @@ diff -ur root-6.08.02.orig/documentation/doxygen/filter.cxx
root-6.08.02/documen
- gLineString = "/// ";
- }
- gLineString += StringFormat( "\\htmlonly <a
href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/noteb...
target=\"_blank\"><img src= notebook.gif alt=\"View in
nbviewer\" style=\"height:1em\" ></a> <a
href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\"
target=\"_blank\"><img
src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"
alt=\"Open in SWAN\" style=\"height:1em\" ></a>
\\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
--
+ gLineString = "";
}
-+
+
// \macro_output found
- if (gLineString.find("\\macro_output") != string::npos) {
- if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s",
gFileName.c_str()).c_str());
diff --git a/root-dont-install-eve7-files.patch b/root-dont-install-eve7-files.patch
new file mode 100644
index 0000000..e2c0561
--- /dev/null
+++ b/root-dont-install-eve7-files.patch
@@ -0,0 +1,39 @@
+From fb33e1aa0b7c0f2ea539a813df2d41b2c000f5b3 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Thu, 14 Feb 2019 13:09:02 +0100
+Subject: [PATCH] Don't install eve7 files if eve7 is not built
+
+---
+ CMakeLists.txt | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74d24d4419..ce38150875 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -446,17 +446,16 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+ else()
+ install(DIRECTORY README DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ endif()
++ if (NOT root7)
++ set(excludeeve7 PATTERN "eve7" EXCLUDE)
++ endif()
+ install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
+ PATTERN "system.rootrc" EXCLUDE
+ PATTERN "system.rootauthrc" EXCLUDE
+ PATTERN "system.rootdaemonrc" EXCLUDE
+- PATTERN "rootd.rc.d" EXCLUDE
+- PATTERN "proofd.rc.d" EXCLUDE
+- PATTERN "rootd.xinetd" EXCLUDE
+- PATTERN "proofd.xinetd" EXCLUDE
+ PATTERN "root.mimes" EXCLUDE
+- PATTERN "cmake" EXCLUDE
+- PATTERN "*.in" EXCLUDE)
++ PATTERN "*.in" EXCLUDE
++ ${excludeeve7})
+ install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
+ install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
+ install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
+--
+2.20.1
+
diff --git a/root-doxygen-generation-with-python-3.patch
b/root-doxygen-generation-with-python-3.patch
new file mode 100644
index 0000000..05e17c1
--- /dev/null
+++ b/root-doxygen-generation-with-python-3.patch
@@ -0,0 +1,248 @@
+From b8b0d770b71b779812ec07b5689ccb30ea35d56e Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Thu, 14 Feb 2019 14:22:22 +0100
+Subject: [PATCH] Fix doxygen generation with Python 3
+
+---
+ documentation/doxygen/Makefile | 3 +++
+ documentation/doxygen/converttonotebook.py | 4 ++--
+ documentation/doxygen/filter.cxx | 19 +++++++++++++------
+ documentation/doxygen/makeimage.py | 4 ++--
+ documentation/doxygen/parallelNotebooks.py | 6 +++---
+ tutorials/dataframe/df003_profiles.py | 5 ++---
+ tutorials/dataframe/df017_vecOpsHEP.py | 13 ++++++-------
+ tutorials/math/tStudent.py | 7 ++++++-
+ 8 files changed, 37 insertions(+), 24 deletions(-)
+
+diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
+index a886c1b729..b50f3cea9a 100644
+--- a/documentation/doxygen/Makefile
++++ b/documentation/doxygen/Makefile
+@@ -1,6 +1,9 @@
+
+ .PHONY: filter folders mathjax images doxygen
+
++PYTHON_EXECUTABLE ?= /usr/bin/python
++export PYTHON_EXECUTABLE
++
+ DOXYGEN_OUTPUT_DIRECTORY ?= $(HOME)/rootdoc
+ export DOXYGEN_OUTPUT_DIRECTORY
+ export DOXYGEN_SOURCE_DIRECTORY := ../..
+diff --git a/documentation/doxygen/converttonotebook.py
b/documentation/doxygen/converttonotebook.py
+index 77aeacedf8..5c9b6cdbd8 100755
+--- a/documentation/doxygen/converttonotebook.py
++++ b/documentation/doxygen/converttonotebook.py
+@@ -727,7 +727,7 @@ def mainfunction(text):
+
+ # add the corresponding metadata
+ if extension == "py":
+- json_data[u'metadata'] = {
++ json_data['metadata'] = {
+ "kernelspec": {
+ "display_name": "Python 2",
+ "language": "python",
+@@ -747,7 +747,7 @@ def mainfunction(text):
+ }
+ }
+ elif isCpp():
+- json_data[u'metadata'] = {
++ json_data['metadata'] = {
+ "kernelspec": {
+ "display_name": "ROOT C++",
+ "language": "c++",
+diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx
+index a199f8137b..6d0f49aacd 100644
+--- a/documentation/doxygen/filter.cxx
++++ b/documentation/doxygen/filter.cxx
+@@ -106,6 +106,7 @@ string gImageWidth; // Width of image
+ string gCwd; // Current working directory
+ string gOutDir; // Output directory
+ string gSourceDir; // Source directory
++string gPythonExec; // Python executable
+ string gOutputName; // File containing a macro std::out
+ bool gHeader; // True if the input file is a header
+ bool gSource; // True if the input file is a source file
+@@ -150,6 +151,10 @@ int main(int argc, char *argv[])
+ gSourceDir = getenv("DOXYGEN_SOURCE_DIRECTORY");
+ ReplaceAll(gSourceDir,"\"","");
+
++ // Retrieve the python executable
++ gPythonExec = getenv("PYTHON_EXECUTABLE");
++ ReplaceAll(gPythonExec,"\"","");
++
+ // Open the input file name.
+ f = fopen(gFileName.c_str(),"r");
+
+@@ -331,10 +336,12 @@ void FilterTutorial()
+ } else {
+ if (gPython) {
+ if (nobatch) {
+- ExecuteCommand(StringFormat("./makeimage.py %s %s %s 0 1
0",
++ ExecuteCommand(StringFormat("%s makeimage.py %s %s %s 0 1
0",
++ gPythonExec.c_str(),
+ gFileName.c_str(), gImageName.c_str(),
gOutDir.c_str()));
+ } else {
+- ExecuteCommand(StringFormat("./makeimage.py %s %s %s 0 1
1",
++ ExecuteCommand(StringFormat("%s makeimage.py %s %s %s 0 1
1",
++ gPythonExec.c_str(),
+ gFileName.c_str(), gImageName.c_str(),
gOutDir.c_str()));
+ }
+ } else {
+@@ -360,9 +367,9 @@ void FilterTutorial()
+
+ // notebook found
+ if (gLineString.find("\\notebook") != string::npos) {
+- ExecuteCommand(StringFormat("python converttonotebook.py %s
%s/notebooks/",
++ ExecuteCommand(StringFormat("%s converttonotebook.py %s
%s/notebooks/",
++ gPythonExec.c_str(),
+ gFileName.c_str(), gOutDir.c_str()));
+-
+ if (gPython){
+ gLineString = "## ";
+ }
+@@ -370,13 +377,13 @@ void FilterTutorial()
+ gLineString = "/// ";
+ }
+ gLineString += StringFormat( "\\htmlonly <a
href=\"http://nbviewer.jupyter.org/url/root.cern.ch/doc/master/noteb...
target=\"_blank\"><img src= notebook.gif alt=\"View in
nbviewer\" style=\"height:1em\" ></a> <a
href=\"https://cern.ch/swanserver/cgi-bin/go?projurl=https://root.cern.ch/doc/master/notebooks/%s.nbconvert.ipynb\"
target=\"_blank\"><img
src=\"http://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png\"
alt=\"Open in SWAN\" style=\"height:1em\" ></a>
\\endhtmlonly \n", gMacroName.c_str() , gMacroName.c_str());
+-
+ }
++
+ // \macro_output found
+ if (gLineString.find("\\macro_output") != string::npos) {
+ remove(gOutputName.c_str());
+ if (!gPython) ExecuteCommand(StringFormat("root -l -b -q %s",
gFileName.c_str()).c_str());
+- else ExecuteCommand(StringFormat("python %s",
gFileName.c_str()).c_str());
++ else ExecuteCommand(StringFormat("%s %s",
gPythonExec.c_str(), gFileName.c_str()).c_str());
+ ExecuteCommand(StringFormat("sed -i '/Processing/d' %s",
gOutputName.c_str()).c_str());
+ rename(gOutputName.c_str(),
StringFormat("%s/macros/%s",gOutDir.c_str(), gOutputName.c_str()).c_str());
+ ReplaceAll(gLineString, "\\macro_output",
StringFormat("\\include %s",gOutputName.c_str()));
+diff --git a/documentation/doxygen/makeimage.py b/documentation/doxygen/makeimage.py
+index 8c68ac6314..f4f0ee9565 100755
+--- a/documentation/doxygen/makeimage.py
++++ b/documentation/doxygen/makeimage.py
+@@ -12,7 +12,7 @@ def makeimage(MacroName, ImageName, OutDir, cp, py, batch):
+ if batch:
+ ROOT.gROOT.SetBatch(1)
+
+- if py: execfile(MacroName)
++ if py: exec(compile(open(MacroName, "rb").read(), MacroName,
'exec'))
+ else: ROOT.gInterpreter.ProcessLine(".x " + MacroName)
+
+ if cp:
+@@ -37,4 +37,4 @@ def makeimage(MacroName, ImageName, OutDir, cp, py, batch):
+
+ if __name__ == "__main__":
+ from sys import argv
+- makeimage(argv[1], argv[2], argv[3], bool(argv[4]), bool(argv[5]), bool(argv[6]))
+\ No newline at end of file
++ makeimage(argv[1], argv[2], argv[3], bool(argv[4]), bool(argv[5]), bool(argv[6]))
+diff --git a/documentation/doxygen/parallelNotebooks.py
b/documentation/doxygen/parallelNotebooks.py
+index 1c8d1f4ef1..6144b72f5a 100644
+--- a/documentation/doxygen/parallelNotebooks.py
++++ b/documentation/doxygen/parallelNotebooks.py
+@@ -52,7 +52,7 @@ try:
+ iterator.remove(element)
+
+ for i in newinputs:
+- print i
++ print(i)
+
+ def processInput(inputFile):
+ subprocess.call(['python',
+@@ -69,5 +69,5 @@ try:
+ parallel(input)
+
+ except:
+- print 'Parallel notebooks converter failed!!'
+- pass
+\ No newline at end of file
++ print('Parallel notebooks converter failed!!')
++ pass
+diff --git a/tutorials/dataframe/df003_profiles.py
b/tutorials/dataframe/df003_profiles.py
+index c80febfaed..cd8c324086 100644
+--- a/tutorials/dataframe/df003_profiles.py
++++ b/tutorials/dataframe/df003_profiles.py
+@@ -12,12 +12,11 @@
+ ## \author Danilo Piparo
+
+ import ROOT
+-RDataFrame = ROOT.ROOT.RDataFrame
+
+ # A simple helper function to fill a test tree: this makes the example
+ # stand-alone.
+ def fill_tree(treeName, fileName):
+- d = RDataFrame(25000)
++ d = ROOT.ROOT.RDataFrame(25000)
+ d.Define("px", "gRandom->Gaus()")\
+ .Define("py", "gRandom->Gaus()")\
+ .Define("pz", "sqrt(px * px + py * py)")\
+@@ -35,7 +34,7 @@ columns = ROOT.vector('string')()
+ columns.push_back("px")
+ columns.push_back("py")
+ columns.push_back("pz")
+-d = RDataFrame(treeName, fileName, columns)
++d = ROOT.ROOT.RDataFrame(treeName, fileName, columns)
+
+ # Create the profiles
+ hprof1d = d.Profile1D(("hprof1d", "Profile of pz versus px", 64, -4,
4))
+diff --git a/tutorials/dataframe/df017_vecOpsHEP.py
b/tutorials/dataframe/df017_vecOpsHEP.py
+index c213c612c0..348b10de5f 100644
+--- a/tutorials/dataframe/df017_vecOpsHEP.py
++++ b/tutorials/dataframe/df017_vecOpsHEP.py
+@@ -11,13 +11,12 @@
+ ## \author Danilo Piparo, Andre Vieira Silva
+
+ import ROOT
+-from math import sqrt
+
+ filename = ROOT.gROOT.GetTutorialDir().Data() +
"/dataframe/df017_vecOpsHEP.root"
+ treename = "myDataset"
+-RDF = ROOT.ROOT.RDataFrame
+
+-def WithPyROOT():
++def WithPyROOT(filename):
++ from math import sqrt
+ f = ROOT.TFile(filename)
+ h = ROOT.TH1F("pt", "pt", 16, 0, 4)
+ for event in f.myDataset:
+@@ -26,8 +25,8 @@ def WithPyROOT():
+ h.Fill(sqrt(px*px + py*py))
+ h.DrawCopy()
+
+-def WithRDataFrameVecOpsJit():
+- f = RDF(treename, filename)
++def WithRDataFrameVecOpsJit(treename, filename):
++ f = ROOT.ROOT.RDataFrame(treename, filename)
+ h = f.Define("good_pt", "sqrt(px*px + py*py)[E>100]")\
+ .Histo1D(("pt", "pt", 16, 0, 4), "good_pt")
+ h.DrawCopy()
+@@ -37,6 +36,6 @@ def WithRDataFrameVecOpsJit():
+ c = ROOT.TCanvas()
+ c.Divide(2,1)
+ c.cd(1)
+-WithPyROOT()
++WithPyROOT(filename)
+ c.cd(2)
+-WithRDataFrameVecOpsJit()
++WithRDataFrameVecOpsJit(treename, filename)
+diff --git a/tutorials/math/tStudent.py b/tutorials/math/tStudent.py
+index fe920c843a..12761d49fb 100644
+--- a/tutorials/math/tStudent.py
++++ b/tutorials/math/tStudent.py
+@@ -38,7 +38,12 @@ for i in range(1, 10):
+ 3.0))
+
+ # For each quantile fill with the pdf
+-xx = [-1.5] + [quant.GetBinContent(i)for i in range(1, 9)] + [1.5]
++xx = []
++xx.append(-1.5)
++for i in range(1, 9):
++ xx.append(quant.GetBinContent(i))
++xx.append(1.5)
++
+ pdfq = []
+ for i in range(9):
+ nbin = int(n * (xx[i+1] - xx[i]) / 3.0 + 1.0)
+--
+2.20.1
+
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index 4016fbc..d540b45 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -203,14 +203,13 @@ diff -ur root-6.14.00.orig/graf2d/asimage/src/TASImage.cxx
root-6.14.00/graf2d/a
diff -ur root-6.14.00.orig/graf2d/graf/CMakeLists.txt
root-6.14.00/graf2d/graf/CMakeLists.txt
--- root-6.14.00.orig/graf2d/graf/CMakeLists.txt 2018-06-13 12:10:40.000000000 +0200
+++ root-6.14.00/graf2d/graf/CMakeLists.txt 2018-06-14 10:36:18.869871880 +0200
-@@ -7,6 +7,6 @@
+@@ -7,5 +7,5 @@
ROOT_STANDARD_LIBRARY_PACKAGE(Graf
DICTIONARY_OPTIONS "-writeEmptyRootPCM"
- LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext
+ LIBRARIES ${FREETYPE_LIBRARIES} ZLIB::ZLIB mathtext
fontconfig
DEPENDENCIES Hist Matrix MathCore RIO BUILTINS FREETYPE)
-
diff -ur root-6.14.00.orig/graf2d/graf/inc/TTF.h root-6.14.00/graf2d/graf/inc/TTF.h
--- root-6.14.00.orig/graf2d/graf/inc/TTF.h 2018-06-13 12:10:40.000000000 +0200
+++ root-6.14.00/graf2d/graf/inc/TTF.h 2018-06-14 10:28:26.055618281 +0200
diff --git a/root-js-syntax.patch b/root-js-syntax.patch
deleted file mode 100644
index 1d8a6c8..0000000
--- a/root-js-syntax.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 575c6e2851939afc6d80395c5e4cae9d2e10b433 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 16 Jan 2018 06:40:07 +0100
-Subject: [PATCH 1/3] Quote word default
-
----
- etc/notebook/JsMVA/js/DecisionTree.js | 6 +++---
- etc/notebook/JsMVA/js/DecisionTree.min.js | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/etc/notebook/JsMVA/js/DecisionTree.js
b/etc/notebook/JsMVA/js/DecisionTree.js
-index 5311974202..18eb8eb200 100644
---- a/etc/notebook/JsMVA/js/DecisionTree.js
-+++ b/etc/notebook/JsMVA/js/DecisionTree.js
-@@ -54,7 +54,7 @@
- },
- link: {
- colors:{
-- default: "#ccc",
-+ "default": "#CCC",
- focus: "#033A00"
- },
- width: "4px",
-@@ -235,7 +235,7 @@
- linkSelector.transition().duration(style.aduration)
- .attr("d", d3path)
- .style("fill", "none")
-- .style("stroke", style.link.colors.default)
-+ .style("stroke", style.link.colors["default"])
- .style("stroke-width", style.link.width)
- .attr("id", function(d){return "link"+d.target.id;});
-
-@@ -251,7 +251,7 @@
- var path = function(node, i, clear){
- svg.selectAll("path.link").filter(function(d){return
d.target.id==node.id;})
- .style("stroke-width", (clear) ? style.link.width :
style.link.focus_width)
-- .style("stroke", (clear) ? style.link.colors.default :
style.link.colors.focus);
-+ .style("stroke", (clear) ? style.link.colors["default"]
: style.link.colors.focus);
-
- svg.selectAll("g.nodes rect").filter(function(d){return
d.id==node.id;})
- .style("stroke-width", style.node.swidth)
---
-2.14.3
-
-From 21d4b8c311a07fa32dc29e76f2a116e7ed429ec0 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 16 Jan 2018 06:44:31 +0100
-Subject: [PATCH 2/3] Avoid new syntax for default arguments
-
----
- etc/notebook/JsMVA/js/NeuralNetwork.js | 5 ++++-
- etc/notebook/JsMVA/js/NeuralNetwork.min.js | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/etc/notebook/JsMVA/js/NeuralNetwork.js
b/etc/notebook/JsMVA/js/NeuralNetwork.js
-index 8e52252be3..25ba32c6ec 100644
---- a/etc/notebook/JsMVA/js/NeuralNetwork.js
-+++ b/etc/notebook/JsMVA/js/NeuralNetwork.js
-@@ -506,7 +506,10 @@
- };
-
-
-- NeuralNetwork.drawDeepNetwork = function (divid, netobj, oldStructure=false) {
-+ NeuralNetwork.drawDeepNetwork = function (divid, netobj, oldStructure) {
-+ if (oldStructure===undefined) {
-+ oldStructure = false;
-+ }
- var div = d3.select("#"+divid);
- canvas = {
- width:
Number(div.property("style")["width"].replace("px","")),
---
-2.14.3
-
-From 501e9d62367de6c1d4e487dd413277e4d74a5ce1 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 16 Jan 2018 06:48:16 +0100
-Subject: [PATCH 3/3] Adapt to filename change in jsroot
-
----
- etc/notebook/JsMVA/js/JsMVA.js | 2 +-
- etc/notebook/JsMVA/js/JsMVA.min.js | 2 +-
- etc/notebook/JsMVA/js/NetworkDesigner.js | 2 +-
- etc/notebook/JsMVA/js/NetworkDesigner.min.js | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/etc/notebook/JsMVA/js/JsMVA.js b/etc/notebook/JsMVA/js/JsMVA.js
-index c8e4522e27..9e474d080e 100644
---- a/etc/notebook/JsMVA/js/JsMVA.js
-+++ b/etc/notebook/JsMVA/js/JsMVA.js
-@@ -32,7 +32,7 @@
-
- require.config({
- paths: {
-- 'd3': JSROOT_source_dir+'d3.v3.min',
-+ 'd3': JSROOT_source_dir+'d3.min',
- 'JsRootCore': JSROOT_source_dir+'JSRootCore.min',
- 'nn': url+'NeuralNetwork.min',
- 'dtree': url+'DecisionTree.min',
-diff --git a/etc/notebook/JsMVA/js/NetworkDesigner.js
b/etc/notebook/JsMVA/js/NetworkDesigner.js
-index ed771fbf81..a744b2371e 100644
---- a/etc/notebook/JsMVA/js/NetworkDesigner.js
-+++ b/etc/notebook/JsMVA/js/NetworkDesigner.js
-@@ -19,7 +19,7 @@
- paths: {
- "jquery-connections": baseURL +
"jquery.connections.min",
- "jquery-timing": baseURL + "jquery-timing.min",
-- "d3":
"https://root.cern.ch/js/notebook/scripts/d3.v3.min"
-+ "d3": "https://root.cern.ch/js/notebook/scripts/d3.min"
- },
- shim: {
- "jquery-ui": {
---
-2.14.3
-
diff --git a/root-jupyroot-static.patch b/root-jupyroot-static.patch
index 67c8ff4..551e019 100644
--- a/root-jupyroot-static.patch
+++ b/root-jupyroot-static.patch
@@ -10,9 +10,9 @@ diff -ur root-6.12.04.orig/bindings/pyroot/JsMVA/JPyInterface.py
root-6.12.04/bi
## String containing the link to JavaScript files
__jsMVASourceDir = __jsMVARepo + "/js"
-diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/utils.py
root-6.12.04/bindings/pyroot/JupyROOT/utils.py
---- root-6.12.04.orig/bindings/pyroot/JupyROOT/utils.py 2017-12-13 08:27:42.000000000
+0100
-+++ root-6.12.04/bindings/pyroot/JupyROOT/utils.py 2018-01-08 13:13:40.857391851 +0100
+diff -ur root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py
root-6.12.04/bindings/pyroot/JupyROOT/helpers/utils.py
+--- root-6.12.04.orig/bindings/pyroot/JupyROOT/helpers/utils.py 2017-12-13
08:27:42.000000000 +0100
++++ root-6.12.04/bindings/pyroot/JupyROOT/helpers/utils.py 2018-01-08 13:13:40.857391851
+0100
@@ -39,7 +39,7 @@
_jsNotDrawableClassesPatterns =
["TEve*","TF3","TPolyLine3D"]
diff --git a/root-memory-usage.patch b/root-memory-usage.patch
index 193a9bf..27fac76 100644
--- a/root-memory-usage.patch
+++ b/root-memory-usage.patch
@@ -1,4 +1,4 @@
-From 3617dd1d911bb5e8fa17a6139dbb887c44dae0fe Mon Sep 17 00:00:00 2001
+From b587d85a5fc8f706362396dc347830f16797b1f2 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Tue, 16 Jan 2018 10:25:50 +0100
Subject: [PATCH] Reduce the needed memory for compilation
@@ -18,18 +18,17 @@ A similar dependency existed before the code latest code changes
(see commit 2638f6fc7f54b0995f2f9d60363daaf8aae2386e), then between
rootcling and libCling.
---
- core/metacling/Module.mk | 6 +++++-
core/metacling/src/CMakeLists.txt | 4 ++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ 1 file changed, 4 insertions(+)
diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt
-index e820d144eb..3a1f1ca446 100644
+index eccd77681d..df941eb3b7 100644
--- a/core/metacling/src/CMakeLists.txt
+++ b/core/metacling/src/CMakeLists.txt
-@@ -37,6 +37,10 @@ ROOT_LINKER_LIBRARY(Cling
- $<TARGET_OBJECTS:Dictgen>
+@@ -86,6 +86,10 @@ ROOT_LINKER_LIBRARY(Cling
$<TARGET_OBJECTS:MetaCling>
- LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS})
+ LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
+
+# The dependency on rootcling_stage1 was added to prevent Cling (libCling) and
+# rootcling_stage1 from being linked in parallel.
+# This avoids doing two memory consuming operations in parallel.
@@ -38,5 +37,5 @@ index e820d144eb..3a1f1ca446 100644
if(MSVC)
set_target_properties(Cling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
--
-2.14.3
+2.20.1
diff --git a/root-missing-header.patch b/root-missing-header.patch
deleted file mode 100644
index c98116d..0000000
--- a/root-missing-header.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f33ac48317fc1a144d6a7f0a7028e898b664e3a2 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Thu, 28 Jun 2018 23:02:46 +0200
-Subject: [PATCH] Add missing include for std::shuffle
-
----
- tmva/tmva/test/TestRandomGenerator.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tmva/tmva/test/TestRandomGenerator.cxx
b/tmva/tmva/test/TestRandomGenerator.cxx
-index c8f0f50ee5f..02f941d7f26 100644
---- a/tmva/tmva/test/TestRandomGenerator.cxx
-+++ b/tmva/tmva/test/TestRandomGenerator.cxx
-@@ -10,6 +10,7 @@
- #include "TMVA/Tools.h"
-
- // Stdlib
-+#include <algorithm>
- #include <iostream>
-
- // External
diff --git a/root-ppc64-doc.patch b/root-ppc64-doc.patch
index 6ab5ab1..843e94e 100644
--- a/root-ppc64-doc.patch
+++ b/root-ppc64-doc.patch
@@ -1,6 +1,17 @@
-diff -ur root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C
root-6.12.04/tutorials/roostats/rs102_hypotestwithshapes.C
---- root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C 2017-12-13
08:27:42.000000000 +0100
-+++ root-6.12.04/tutorials/roostats/rs102_hypotestwithshapes.C 2018-01-15
21:30:10.608693441 +0100
+diff -ur root-6.16.00.orig/tutorials/dataframe/df006_ranges.py
root-6.16.00/tutorials/dataframe/df006_ranges.py
+--- root-6.16.00.orig/tutorials/dataframe/df006_ranges.py 2019-01-23 09:23:37.000000000
+0100
++++ root-6.16.00/tutorials/dataframe/df006_ranges.py 2019-02-14 15:05:28.515294288 +0100
+@@ -4,7 +4,6 @@
+ ## This tutorial shows how to express the concept of ranges when working with the
RDataFrame.
+ ##
+ ## \macro_code
+-## \macro_output
+ ##
+ ## \date March 2017
+ ## \author Danilo Piparo
+diff -ur root-6.16.00.orig/tutorials/roostats/rs102_hypotestwithshapes.C
root-6.16.00/tutorials/roostats/rs102_hypotestwithshapes.C
+--- root-6.16.00.orig/tutorials/roostats/rs102_hypotestwithshapes.C 2019-01-23
09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/roostats/rs102_hypotestwithshapes.C 2019-02-14
15:00:40.498382881 +0100
@@ -13,8 +13,6 @@
/// In this example, shape uncertainties are not taken into account, but
/// normalization uncertainties are.
@@ -10,9 +21,9 @@ diff -ur root-6.12.04.orig/tutorials/roostats/rs102_hypotestwithshapes.C
root-6.
/// \macro_code
///
/// \author Kyle Cranmer
-diff -ur root-6.12.04.orig/tutorials/roostats/rs701_BayesianCalculator.C
root-6.12.04/tutorials/roostats/rs701_BayesianCalculator.C
---- root-6.12.04.orig/tutorials/roostats/rs701_BayesianCalculator.C 2017-12-13
08:27:42.000000000 +0100
-+++ root-6.12.04/tutorials/roostats/rs701_BayesianCalculator.C 2018-01-15
21:30:39.405371047 +0100
+diff -ur root-6.16.00.orig/tutorials/roostats/rs701_BayesianCalculator.C
root-6.16.00/tutorials/roostats/rs701_BayesianCalculator.C
+--- root-6.16.00.orig/tutorials/roostats/rs701_BayesianCalculator.C 2019-01-23
09:23:37.000000000 +0100
++++ root-6.16.00/tutorials/roostats/rs701_BayesianCalculator.C 2019-02-14
15:00:40.510382752 +0100
@@ -5,8 +5,6 @@
///
/// This tutorial shows an example of using the BayesianCalculator class
diff --git a/root-set-cache-file-dir.patch b/root-set-cache-file-dir.patch
deleted file mode 100644
index 5ea37d7..0000000
--- a/root-set-cache-file-dir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e8778178329efc8e04ea35643259cfc6ec2f9b51 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 26 Jun 2018 11:11:48 +0200
-Subject: [PATCH] Set cache file dir when using CACHEREAD option Remove
- unnecessary CACHEREAD for local file
-
----
- tmva/tmva/test/DNN/CNN/TestMethodDL.h | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tmva/tmva/test/DNN/CNN/TestMethodDL.h
b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
-index 1cac008458e..904fb54cd97 100644
---- a/tmva/tmva/test/DNN/CNN/TestMethodDL.h
-+++ b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
-@@ -49,14 +49,12 @@ void testMethodDL_CNN(TString architectureStr)
- // Load the input data
-
- TString fname = "imagesData.root";
-- TString fopt = "CACHEREAD";
-- //auto input = TFile::Open(fname,fopt);
-
- // generate the files
- // 1000 for testing 1000 for training
- makeImages(2000);
-
-- auto input = TFile::Open(fname,fopt);
-+ auto input = TFile::Open(fname);
-
- R__ASSERT(input);
-
-@@ -174,6 +172,7 @@ void testMethodDL_DNN(TString architectureStr)
- // TString fname =
"/Users/vladimirilievski/Desktop/Vladimir/GSoC/ROOT-CI/common-version/root/tmva/tmva/test/DNN/CNN/"
- // "dataset/tmva_class_example.root";
- TString fname = "http://root.cern.ch/files/tmva_class_example.root";
-+ TFile::SetCacheFileDir(".");
- TString fopt = "CACHEREAD";
- input = TFile::Open(fname,fopt);
-
diff --git a/root-stressgraphics-ref.patch b/root-stressgraphics-ref.patch
deleted file mode 100644
index 4ba858c..0000000
--- a/root-stressgraphics-ref.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 034dd2ec5ab656551b84bcec7cc1e7f7e23b663c Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Thu, 31 May 2018 10:18:58 +0200
-Subject: [PATCH] Adjust reference for Aarch64
-
----
- test/stressGraphics.ref | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
-index 00e034737b8..00899519366 100644
---- a/test/stressGraphics.ref
-+++ b/test/stressGraphics.ref
-@@ -30,15 +30,15 @@ Test# PS1Ref# PS1Err# PDFRef# PDFErr# GIFRef# GIFErr#
JPGRef# JP
- 29 7419 500 15112 200 8113 4200 18872 21600
7928 7000 7296 500
- 30 17016 5500 18198 100 13764 3400 32434 17400
22157 5000 20823 5500
- 31 30615 8200 27494 150 29010 5900 50520 18200
35724 5400 36690 8200
-- 32 3304592 100 712308 100 155478 32000 62688 19000
123056 7000 0 0
-- 33 321963 5500 434394 1000 34942 8300 65532 27800
37314 12000 331505 5500
-+ 32 3304592 100 712308 500 155478 32000 62688 19000
123056 7000 0 0
-+ 33 321963 5500 434394 1100 34942 8300 65532 27800
37314 12000 331505 5500
- 34 36514 300 16815 200 25333 2200 47408 12700
33739 3700 36399 300
- 35 207729 750 87126 100 41853 6200 76094 38000
54717 11000 210497 800
- 36 401670 6500 156361 500 38898 10400 62719 34100
45592 14000 410114 6500
- 37 566142 5000 225206 750 43638 6300 65828 31800
53934 6500 573396 5000
-- 38 3738751 35000 1292739 500 84139 3400 60580 9900
133547 3500 3783013 35000
-+ 38 3738751 35000 1292739 8000 84139 3400 60580 9900
133547 3500 3783013 35000
- 39 1456993 9000 853193 50000 54777 8600 38425 13500
91242 18100 1463263 7500
-- 40 38312 200 56877 100 47205 3900 36524 11800
119641 8000 38121 200
-+ 40 38312 200 56877 250 47205 3900 36524 11800
119641 8000 38121 200
- 41 15025 3000 29289 500 34091 1500 42525 11300
33336 3900 14787 4000
- 42 254604 5000 376027 7000 34608 5000 55666 30400
46534 6500 259594 7000
- 43 4846 150 14075 100 24281 200 33239 600
25303 300 4877 150
diff --git a/root-test-compilation-epel7.patch b/root-test-compilation-epel7.patch
deleted file mode 100644
index 97e31ff..0000000
--- a/root-test-compilation-epel7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cefdf878609deb650b1e548d84efab2ab5c775ce Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Thu, 28 Jun 2018 07:38:07 +0200
-Subject: [PATCH] Fix test compilation on RHEL 7
-
----
- tree/dataframe/test/dataframe_resptr.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tree/dataframe/test/dataframe_resptr.cxx
b/tree/dataframe/test/dataframe_resptr.cxx
-index 9fef6e54fcf..7c45f016d0c 100644
---- a/tree/dataframe/test/dataframe_resptr.cxx
-+++ b/tree/dataframe/test/dataframe_resptr.cxx
-@@ -45,11 +45,11 @@ TEST(RResultPtr, ImplConv)
- return (int)1;
- }).Histo1D<int>("i");
-
-- EXPECT_TRUE(m);
-+ EXPECT_TRUE(m != nullptr);
- EXPECT_FALSE(hasRun);
-
- *m;
-
-- EXPECT_TRUE(m);
-+ EXPECT_TRUE(m != nullptr);
- EXPECT_TRUE(hasRun);
- }
diff --git a/root-test-subdirs.patch b/root-test-subdirs.patch
deleted file mode 100644
index 67a22c2..0000000
--- a/root-test-subdirs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 41e33db9d17e4d295bf12958398fc3758d3e3a5b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Tue, 19 Jun 2018 09:20:21 +0200
-Subject: [PATCH] Include test directory using ROOT_ADD_TEST_SUBDIRECTORY
-
----
- graf2d/gpadv7/CMakeLists.txt | 5 +----
- graf2d/primitives/CMakeLists.txt | 5 ++---
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/graf2d/gpadv7/CMakeLists.txt b/graf2d/gpadv7/CMakeLists.txt
-index 525ce415451..9d6870231f3 100644
---- a/graf2d/gpadv7/CMakeLists.txt
-+++ b/graf2d/gpadv7/CMakeLists.txt
-@@ -11,7 +11,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7
- DICTIONARY_OPTIONS "-writeEmptyRootPCM"
- DEPENDENCIES ROOTGraphicsPrimitives)
-
--
--if(testing)
-- ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
--endif()
-+ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
-diff --git a/graf2d/primitives/CMakeLists.txt b/graf2d/primitives/CMakeLists.txt
-index f491eb70a90..d33597805d8 100644
---- a/graf2d/primitives/CMakeLists.txt
-+++ b/graf2d/primitives/CMakeLists.txt
-@@ -11,6 +11,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGraphicsPrimitives
- SOURCES ${src}
- DICTIONARY_OPTIONS "-writeEmptyRootPCM"
- DEPENDENCIES RIO Core)
--if(testing)
-- add_subdirectory(v7/test)
--endif()
-+
-+ROOT_ADD_TEST_SUBDIRECTORY(v7/test)
diff --git a/root-testfiles.sh b/root-testfiles.sh
index c3f1d40..5984c5f 100755
--- a/root-testfiles.sh
+++ b/root-testfiles.sh
@@ -11,7 +11,7 @@ wget -N ${SITE}/alice3_ref_6.root
wget -N ${SITE}/alice3.root
wget -N ${SITE}/ams_ref_4.root
wget -N ${SITE}/ams.root
-wget -N ${SITE}/atlas_ref_5.root
+wget -N ${SITE}/atlas_ref_6.root
wget -N ${SITE}/atlas.root
wget -N ${SITE}/babar2_ref_4.root
wget -N ${SITE}/babar2.root
diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch
index b5f0531..3daf4b9 100644
--- a/root-unbundle-gtest.patch
+++ b/root-unbundle-gtest.patch
@@ -1,7 +1,7 @@
-diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake
root-6.14.06/cmake/modules/SearchInstalledSoftware.cmake
---- root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake 2018-11-05
10:30:03.000000000 +0100
-+++ root-6.14.06/cmake/modules/SearchInstalledSoftware.cmake 2018-11-06
10:06:56.399528378 +0100
-@@ -1556,75 +1556,18 @@
+diff -ur root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake
root-6.16.00/cmake/modules/SearchInstalledSoftware.cmake
+--- root-6.16.00.orig/cmake/modules/SearchInstalledSoftware.cmake 2019-01-23
09:23:37.000000000 +0100
++++ root-6.16.00/cmake/modules/SearchInstalledSoftware.cmake 2019-01-25
12:43:58.106532400 +0100
+@@ -1525,76 +1525,18 @@
#---Download googletest--------------------------------------------------------------
if (testing)
@@ -48,6 +48,7 @@ diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake
root-6.14
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+- -DCMAKE_AR=${CMAKE_AR}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- ${EXTRA_GTEST_OPTS}
- # Disable install step
@@ -82,4 +83,4 @@ diff -ur root-6.14.06.orig/cmake/modules/SearchInstalledSoftware.cmake
root-6.14
+ endif()
endif()
- #---Report non implemented options---------------------------------------------------
+
diff --git a/root-unique-filenames.patch b/root-unique-filenames.patch
deleted file mode 100644
index 4a9b5a6..0000000
--- a/root-unique-filenames.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 430c06386ec70a40265c77047ccc1e980322091e Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Thu, 22 Nov 2018 16:59:55 +0100
-Subject: [PATCH] Make tutorial filenames unique to avoid overwrites
-
----
- tutorials/multicore/mp001_fillHistos.C | 2 +-
- tutorials/multicore/mt001_fillHistos.C | 2 +-
- tutorials/multicore/mtbb001_fillHistos.C | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tutorials/multicore/mp001_fillHistos.C
b/tutorials/multicore/mp001_fillHistos.C
-index 081d5a3645a..6fd461b4442 100644
---- a/tutorials/multicore/mp001_fillHistos.C
-+++ b/tutorials/multicore/mp001_fillHistos.C
-@@ -23,7 +23,7 @@ Int_t mp001_fillHistos()
- auto workItem = [](UInt_t workerID) {
- // One generator, file and ntuple per worker
- TRandom3 workerRndm(workerID); // Change the seed
-- TFile f(Form("myFile_%u.root", workerID), "RECREATE");
-+ TFile f(Form("myFile_mp001_%u.root", workerID), "RECREATE");
- TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4,
4);
- for (UInt_t i = 0; i < nNumbers; ++i) {
- h.Fill(workerRndm.Gaus());
-diff --git a/tutorials/multicore/mt001_fillHistos.C
b/tutorials/multicore/mt001_fillHistos.C
-index 4a4c08558c1..d293e1f2b7d 100644
---- a/tutorials/multicore/mt001_fillHistos.C
-+++ b/tutorials/multicore/mt001_fillHistos.C
-@@ -26,7 +26,7 @@ Int_t mt001_fillHistos()
- auto workItem = [](UInt_t workerID) {
- // One generator, file and ntuple per worker
- TRandom3 workerRndm(workerID); // Change the seed
-- TFile f(Form("myFile_%u.root", workerID), "RECREATE");
-+ TFile f(Form("myFile_mt001_%u.root", workerID), "RECREATE");
- TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4,
4);
- for (UInt_t i = 0; i < nNumbers; ++i) {
- h.Fill(workerRndm.Gaus());
-diff --git a/tutorials/multicore/mtbb001_fillHistos.C
b/tutorials/multicore/mtbb001_fillHistos.C
-index 9f967938017..64390b2d4cc 100644
---- a/tutorials/multicore/mtbb001_fillHistos.C
-+++ b/tutorials/multicore/mtbb001_fillHistos.C
-@@ -23,7 +23,7 @@ Int_t mtbb001_fillHistos()
- auto workItem = [](UInt_t workerID) {
- // One generator, file and ntuple per worker
- TRandom3 workerRndm(workerID); // Change the seed
-- TFile f(Form("myFile_%u.root", workerID), "RECREATE");
-+ TFile f(Form("myFile_mtbb001_%u.root", workerID),
"RECREATE");
- TH1F h(Form("myHisto_%u", workerID), "The Histogram", 64, -4,
4);
- for (UInt_t i = 0; i < nNumbers; ++i) {
- h.Fill(workerRndm.Gaus());
diff --git a/root-v7-line.patch b/root-v7-line.patch
new file mode 100644
index 0000000..db9da4a
--- /dev/null
+++ b/root-v7-line.patch
@@ -0,0 +1,32 @@
+From 197ba8fbeccaa49d70a3593ed0e4b1595dd64218 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Thu, 14 Feb 2019 13:14:54 +0100
+Subject: [PATCH] Fix v7 line tutorial when running in batch mode
+
+---
+ tutorials/v7/line.cxx | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/tutorials/v7/line.cxx b/tutorials/v7/line.cxx
+index b016fd0371..3256de4ecf 100644
+--- a/tutorials/v7/line.cxx
++++ b/tutorials/v7/line.cxx
+@@ -6,7 +6,6 @@
+ /// "normal" coordinates' system and changing the line color linearly from
black
+ /// to red.
+ ///
+-/// \macro_image (line.png)
+ /// \macro_code
+ ///
+ /// \date 2018-03-18
+@@ -43,6 +42,5 @@ void line()
+ canvas->Draw(RLine({0.1_normal, 0.1_normal}, {0.1_normal,0.9_normal}));
+ canvas->Draw(RLine({0.0_normal, 1.0_normal}, {1.0_normal,0.0_normal}));
+
+- // canvas->Show();
+- canvas->SaveAs("line.png");
++ canvas->Show();
+ }
+--
+2.20.1
+
diff --git a/root.spec b/root.spec
index 04665e9..db883bb 100644
--- a/root.spec
+++ b/root.spec
@@ -44,9 +44,9 @@
%global __provides_exclude_from
^(%{python2_sitearch}|%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\\.so$
Name: root
-Version: 6.14.08
+Version: 6.16.00
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
License: LGPLv2+
@@ -61,13 +61,10 @@ Source0: %{name}-%{version}.tar.xz
Source1: %{name}-testfiles.tar.xz
# Script to generate above source
Source2: %{name}-testfiles.sh
-# systemd unit files
-Source3: rootd.service
-Source4: proofd.service
# Use system fonts
Patch0: %{name}-fontconfig.patch
-# Don't create documentation notebooks
-Patch1: %{name}-doc-no-notebooks.patch
+# Revert the removal of DataFrame for 32 bit architectures
+Patch1: %{name}-32bit-dataframe.patch
# Don't run gui macros
Patch2: %{name}-avoid-gui-crash.patch
# Unbundle gtest
@@ -78,52 +75,35 @@ Patch4: %{name}-jupyroot-static.patch
Patch5: %{name}-PowerPC-Don-t-use-xscvdpspn-on-the-P7.patch
Patch6: %{name}-Fix-return-type-in-ORC-readMem-client-interface.patch
Patch7: %{name}-PPC-Avoid-non-simple-MVT-in-STBRX-optimization.patch
-# Fix some javascript syntax choking yuicompressor
-# Adapt d3 path to updated jsroot
-#
https://github.com/root-project/root/pull/1520
-Patch8: %{name}-js-syntax.patch
-# Always use ROOT_ADD_TEST_SUBDIRECTORY when adding test dirs
-#
https://github.com/root-project/root/pull/2247
-Patch9: %{name}-test-subdirs.patch
# Reduce memory usage of build
#
https://github.com/root-project/root/pull/1516
-Patch10: %{name}-memory-usage.patch
+Patch8: %{name}-memory-usage.patch
# Reduce memory usage during linking on ARM and x86 by generating
# smaller debuginfo for the llmv libraries.
# Fedora builders run out of memory with the default setting.
-Patch11: %{name}-memory-arm-x86.patch
+Patch9: %{name}-memory-arm-x86.patch
# Don't run tutorials that crash on ppc64 during doc generation.
# Ensures content of doc package is the same on all architecture
# so that koji accepts it as a noarch package.
-Patch12: %{name}-ppc64-doc.patch
-# Adjust allowed deviation for PDF file sizes (aarch64)
-#
https://github.com/root-project/root/pull/2120
-Patch13: %{name}-stressgraphics-ref.patch
-# Adjust Vavilov test for Fedora 29 ix86
-#
https://github.com/root-project/root/pull/2273
-Patch14: %{name}-adjust-allowed-test-difference-for-32-bit-ix86.patch
+Patch10: %{name}-ppc64-doc.patch
# Don't install minicern static library
-Patch15: %{name}-dont-install-minicern.patch
-# Set Cache File Dir
-#
https://github.com/root-project/root/pull/2246
-Patch16: %{name}-set-cache-file-dir.patch
-# Fix test compilation on EPEL 7
-#
https://github.com/root-project/root/pull/2263
-Patch17: %{name}-test-compilation-epel7.patch
-# Missing include for std::shuffle
-#
https://github.com/root-project/root/pull/2267
-Patch18: %{name}-missing-header.patch
+Patch11: %{name}-dont-install-minicern.patch
# Optimization issue in Geom library
-Patch19: %{name}-ix32-geom-opt.patch
-# Missing libcrypto dependency for libSrvAuth
-#
https://github.com/root-project/root/pull/2436
-Patch20: %{name}-crypto.patch
+Patch12: %{name}-ix32-geom-opt.patch
# Let clang ignore some gcc options it hasn't implemented
#
https://github.com/root-project/root/pull/2933
-Patch21: %{name}-clang-ignore-gcc-options.patch
-# Make tutorial filenames unique to avoid overwrites
-#
https://github.com/root-project/root/pull/3029
-Patch22: %{name}-unique-filenames.patch
+Patch13: %{name}-clang-ignore-gcc-options.patch
+# Make doxygen generation wotk with Python 3
+#
https://github.com/root-project/root/pull/3434
+Patch14: %{name}-doxygen-generation-with-python-3.patch
+# Don't create documentation notebooks
+Patch15: %{name}-doc-no-notebooks.patch
+# Make tutorial/v7/line.cxx run in batch mode
+#
https://github.com/root-project/root/pull/3435
+Patch16: %{name}-v7-line.patch
+# Only install eve7 js files when eve7 is built
+#
https://github.com/root-project/root/pull/3436
+Patch17: %{name}-dont-install-eve7-files.patch
# s390x suffers from endian issues resulting in failing tests
# and broken documentation generation
@@ -231,7 +211,6 @@ BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: yuicompressor
BuildRequires: perl-generators
-BuildRequires: systemd-units
BuildRequires: gtest-devel
BuildRequires: gmock-devel
# Some of the tests call lsb_release
@@ -375,6 +354,8 @@ Requires: urw-fonts
Requires: font(droidsansfallback)
Obsoletes: %{name}-ruby < 6.00.00
Obsoletes: %{name}-vdt < 6.10.00
+Obsoletes: %{name}-proof-pq2 < 6.16.00
+Obsoletes: %{name}-rootd < 6.16.00
%if %{py3default}
# Don't build python2-jupyroot/jsmva packages for Fedora >= 29
Obsoletes: python2-jupyroot < %{version}-%{release}
@@ -418,38 +399,6 @@ Obsoletes: %{name}-reflex < 6.00.00
Cling is an interactive C++ interpreter, built on top of Clang and
LLVM compiler infrastructure.
-%package proofd
-Summary: Parallel ROOT Facility - distributed, parallel computing
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-proof%{?_isa} = %{version}-%{release}
-# Dynamic dependency
-Requires: %{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun): systemd-units
-Requires(post): systemd-units
-Requires(postun): systemd-units
-
-%description proofd
-This package contains the PROOF server. Proofd is the core daemon of
-the PROOF (Parallel ROOT Facility) system for distributed parallel
-computing. Installing this package on a machine makes it possible
-for the machine to participate in a parallel computing farm (cluster
-or via the Internet), either as a master or a slave, using a
-transparent interface.
-
-%package rootd
-Summary: ROOT remote file server
-# Dynamic dependency
-Requires: %{name}-net-rpdutils%{?_isa} = %{version}-%{release}
-Requires(preun): systemd-units
-Requires(post): systemd-units
-Requires(postun): systemd-units
-
-%description rootd
-This package contains the ROOT file server. Rootd is a server for ROOT
-files, serving files over the Internet. Using this daemon, you can
-access files on the machine from anywhere on the Internet, using a
-transparent interface.
-
%package -n python2-%{name}
Summary: Python extension for ROOT
Provides: %{name}-python = %{version}-%{release}
@@ -1312,11 +1261,11 @@ Requires: %{name}-io%{?_isa} = %{version}-%{release}
This package contains the ROOT networking library.
%package net-rpdutils
-Summary: Authentication utilities used by rootd and proofd
+Summary: Authentication utilities used by xproofd
Requires: %{name}-core%{?_isa} = %{version}-%{release}
%description net-rpdutils
-This package contains authentication utilities used by rootd and proofd.
+This package contains authentication utilities used by xproofd.
%package net-bonjour
Summary: Bonjour extension for ROOT
@@ -1460,17 +1409,6 @@ Obsoletes: %{name}-proof < 6.14.00
%description proof-player
This package contains the proof player extension for ROOT.
-%package proof-pq2
-Summary: PROOF Quick Query (pq2)
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-hist%{?_isa} = %{version}-%{release}
-Requires: %{name}-io%{?_isa} = %{version}-%{release}
-Requires: %{name}-net%{?_isa} = %{version}-%{release}
-Requires: %{name}-proof%{?_isa} = %{version}-%{release}
-
-%description proof-pq2
-Shell-based interface to the PROOF dataset handling.
-
%package proof-sessionviewer
Summary: GUI to browse an interactive PROOF session
Requires: %{name}-core%{?_isa} = %{version}-%{release}
@@ -1495,6 +1433,7 @@ Requires: %{name}-proof%{?_isa} = %{version}-%{release}
# Dynamic dependency
Requires: %{name}-net-rpdutils%{?_isa} = %{version}-%{release}
Requires: xrootd-server%{?_isa}
+Obsoletes: %{name}-proofd < 6.16.00
%description xproof
This package contains the xproof extension for ROOT. This provides a
@@ -1575,6 +1514,7 @@ ROOT environment.
Summary: Toolkit for multivariate data analysis
License: BSD
Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf%{?_isa} = %{version}-%{release}
Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
Requires: %{name}-hist%{?_isa} = %{version}-%{release}
Requires: %{name}-io%{?_isa} = %{version}-%{release}
@@ -1663,6 +1603,7 @@ This package contains the Tree library for ROOT.
Summary: A high level interface to ROOT trees
Requires: %{name}-core%{?_isa} = %{version}-%{release}
Requires: %{name}-hist%{?_isa} = %{version}-%{release}
+Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
Requires: %{name}-tree%{?_isa} = %{version}-%{release}
Requires: %{name}-tree-player%{?_isa} = %{version}-%{release}
# Library split (tree-dataframe and vecops from tree-player)
@@ -1754,6 +1695,25 @@ Requires: %{name}-core%{?_isa} = %{version}-%{release}
%description graf-primitives
This package contains graphics primitives for ROOT 7
+%package graf3d-eve7
+Summary: Event display library for ROOT (ROOT 7)
+Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-geom%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf3d%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires: %{name}-io%{?_isa} = %{version}-%{release}
+Requires: %{name}-net-http%{?_isa} = %{version}-%{release}
+Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
+Requires: %{name}-montecarlo-eg%{?_isa} = %{version}-%{release}
+Requires: %{name}-physics%{?_isa} = %{version}-%{release}
+Requires: %{name}-tree%{?_isa} = %{version}-%{release}
+Requires: %{name}-tree-player%{?_isa} = %{version}-%{release}
+
+%description graf3d-eve7
+This package contains a library for defining event displays in ROOT 7.
+
%package gui-canvaspainter
Summary: Canvas painter (ROOT 7)
Requires: %{name}-core%{?_isa} = %{version}-%{release}
@@ -1781,10 +1741,11 @@ various kinds of data.
%package gui-qt5webdisplay
Summary: Qt5 Web display (ROOT 7)
Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
Requires: %{name}-net-http%{?_isa} = %{version}-%{release}
%description gui-qt5webdisplay
-This package contains a Qt5 web display extension for ROOT 7
+This package contains a Qt5 web display extension for ROOT 7.
%endif
%package gui-webdisplay
@@ -1794,7 +1755,19 @@ Requires: %{name}-mathcore%{?_isa} = %{version}-%{release}
Requires: %{name}-net-http%{?_isa} = %{version}-%{release}
%description gui-webdisplay
-This package contains a web display extension for ROOT 7
+This package contains a web display extension for ROOT 7.
+
+%package gui-webgui6
+Summary: Web based GUI for ROOT
+Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Requires: %{name}-graf-gpad%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui%{?_isa} = %{version}-%{release}
+Requires: %{name}-gui-webdisplay%{?_isa} = %{version}-%{release}
+Requires: %{name}-hist%{?_isa} = %{version}-%{release}
+Requires: %{name}-io%{?_isa} = %{version}-%{release}
+
+%description gui-webgui6
+This package provides a Web based GUI for ROOT.
%package hist-draw
Summary: Histogram drawing (ROOT 7)
@@ -1818,7 +1791,10 @@ This package contains an histogram drawing extension for ROOT 7.
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%if %{?fedora}%{!?fedora:0} <= 28 && %{?rhel}%{!?rhel:0} <= 7
+# Only relevant for distributions with ppc64 build (ppc64le not affected)
%patch10 -p1
+%endif
%patch11 -p1
%patch12 -p1
%patch13 -p1
@@ -1826,11 +1802,6 @@ This package contains an histogram drawing extension for ROOT 7.
%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
# Remove bundled sources in order to be sure they are not used
# * afterimage
@@ -1955,7 +1926,6 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dbuiltin_xxhash:BOOL=OFF \
-Dbuiltin_zlib:BOOL=OFF \
-Dafdsmgrd:BOOL=OFF \
- -Dafs:BOOL=OFF \
-Dalien:BOOL=OFF \
-Darrow:BOOL=OFF \
-Dasimage:BOOL=ON \
@@ -1964,7 +1934,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dcastor:BOOL=OFF \
-Dccache:BOOL=OFF \
-Dcefweb:BOOL=OFF \
- -Dchirp:BOOL=OFF \
+ -Dclad:BOOL=OFF \
-Dcling:BOOL=ON \
-Dcocoa:BOOL=OFF \
-Dcuda:BOOL=OFF \
@@ -1985,10 +1955,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dfitsio:BOOL=ON \
-Dfortran:BOOL=ON \
-Dgdml:BOOL=ON \
- -Dgenvector:BOOL=ON \
-Dgeocad:BOOL=ON \
-Dgfal:BOOL=ON \
- -Dglite:BOOL=OFF \
-Dglobus:BOOL=ON \
-Dgsl_shared:BOOL=ON \
-Dgviz:BOOL=ON \
@@ -2035,12 +2003,10 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Drpath:BOOL=OFF \
-Druby:BOOL=OFF \
-Druntime_cxxmodules:BOOL=OFF \
- -Dsapdb:BOOL=OFF \
-Dshadowpw:BOOL=ON \
-Dshared:BOOL=ON \
-Dsoversion:BOOL=ON \
-Dsqlite:BOOL=ON \
- -Dsrp:BOOL=OFF \
-Dssl:BOOL=ON \
-Dtable:BOOL=ON \
-Dtcmalloc:BOOL=OFF \
@@ -2052,6 +2018,8 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}"
-Dtmva-cpu:BOOL=OFF \
%endif
-Dtmva-gpu:BOOL=OFF \
+ -Dtmva-pymva:BOOL=ON \
+ -Dtmva-rmva:BOOL=ON \
-Dunuran:BOOL=ON \
-Dvc:BOOL=OFF \
-Dvdt:BOOL=OFF \
@@ -2189,11 +2157,6 @@ install -p -m 644
build/package/debian/root-system-bin.sharedmimeinfo \
install -p -m 644 build/package/debian/application-x-root.png \
%{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-# systemd unit files for services
-mkdir -p %{buildroot}%{_unitdir}
-install -p -m 644 %SOURCE3 %{buildroot}%{_unitdir}
-install -p -m 644 %SOURCE4 %{buildroot}%{_unitdir}
-
# Move python cli helper to its own directory
mkdir -p %{buildroot}%{_datadir}/%{name}/cli
mv %{buildroot}%{_libdir}/%{name}/cmdLineUtils.py* \
@@ -2381,12 +2344,9 @@ if [ -z "\$(type jupyter-notebook 2>/dev/null)" ] ;
then
echo jupyter-notebook not found in path. Exiting.
exit 1
fi
-jupyter notebook
+jupyter notebook "\$@"
EOF
-# These should be in PATH
-mv %{buildroot}%{_datadir}/%{name}/proof/utils/pq2/pq2* %{buildroot}%{_bindir}
-
# Avoid /usr/bin/env shebangs (and adapt cli to cmdLineUtils location)
sed -e 's!/usr/bin/env bash!/bin/bash!' -i %{buildroot}%{_bindir}/root-config
sed -e 's!/usr/bin/env python2!%{__python2}!' \
@@ -2418,15 +2378,10 @@ sed -e 's!/usr/bin/env python!%{__pythondef}!' \
%{buildroot}%{_pkgdocdir}/tutorials/tmva/keras/RegressionKeras.py
# Remove some junk
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.plist
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.rc.d
-rm %{buildroot}%{_datadir}/%{name}/daemons/*.xinetd
-rm %{buildroot}%{_datadir}/%{name}/daemons/README
rm %{buildroot}%{_datadir}/%{name}/hostcert.conf
rm %{buildroot}%{_datadir}/%{name}/proof/*.sample
rm -rf %{buildroot}%{_datadir}/%{name}/proof/utils
rm %{buildroot}%{_datadir}/%{name}/root.desktop
-rm %{buildroot}%{_datadir}/%{name}/system.plugins-ios
rm %{buildroot}%{_bindir}/setenvwrap.csh
rm %{buildroot}%{_bindir}/setxrd*
rm %{buildroot}%{_bindir}/thisroot*
@@ -2434,11 +2389,11 @@ rm %{buildroot}%{_mandir}/man1/g2rootold.1
rm %{buildroot}%{_mandir}/man1/genmap.1
rm %{buildroot}%{_mandir}/man1/proofserva.1
rm %{buildroot}%{_mandir}/man1/roota.1
-rm %{buildroot}%{_mandir}/man1/setup-pq2.1
rm %{buildroot}%{_includedir}/%{name}/*.cw
rm %{buildroot}%{_includedir}/%{name}/*.pri
rm %{buildroot}%{_pkgdocdir}/INSTALL
rm %{buildroot}%{_pkgdocdir}/README.ALIEN
+rm %{buildroot}%{_pkgdocdir}/README.CXXMODULES.md
rm %{buildroot}%{_pkgdocdir}/README.MONALISA
# Only used on Windows
@@ -2450,7 +2405,6 @@ rm TAFS/P010_TAFS.C
rm TDataProgressDialog/P010_TDataProgressDialog.C
rm TDataSetManager/P020_TDataSetManagerAliEn.C
rm TFile/P030_TCastorFile.C
-rm TFile/P060_TChirpFile.C
rm TFile/P070_TAlienFile.C
%if %{hadoop} == 0
rm TFile/P110_THDFSFile.C
@@ -2459,6 +2413,9 @@ rm TGLManager/P020_TGWin32GLManager.C
rm TGLManager/P030_TGOSXGLManager.C
rm TGrid/P010_TAlien.C
rm TGrid/P020_TGLite.C
+%if %{root7} == 0
+rm TGuiFactory/P030_TWebGuiFactory.C
+%endif
rm TImagePlugin/P010_TASPluginGS.C
rm TSQLServer/P030_TSapDBServer.C
rm TSQLServer/P040_TOracleServer.C
@@ -2472,6 +2429,9 @@ rm TVirtualGLImp/P020_TGWin32GL.C
rm TVirtualMonitoringWriter/P010_TMonaLisaWriter.C
rm TVirtualX/P030_TGWin32.C
rm TVirtualX/P050_TGQuartz.C
+%if %{root7} == 0
+rm TVirtualX/P060_TWebVirtualX.C
+%endif
rmdir TAFS
rmdir TDataProgressDialog
rmdir TGrid
@@ -2511,6 +2471,7 @@ cp -p interpreter/llvm/src/README.txt
interpreter/llvm/src/llvm-README.txt
# Generate documentation
pushd documentation/doxygen
ln -s ../../files files
+ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
# Create the py-hsimple.root file in advance (needed as input)
ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
ROOTSYS=${PWD}/../../builddir \
@@ -2521,7 +2482,7 @@ ROOTIGNOREPREFIX=1 PATH=${PWD}/../../builddir/bin:${PATH} \
ROOTSYS=${PWD}/../../builddir \
LD_LIBRARY_PATH=${PWD}/../../builddir/lib \
PYTHONPATH=${PWD}/../../builddir/lib \
- make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc
+ make DOXYGEN_OUTPUT_DIRECTORY=${PWD}/doc PYTHON_EXECUTABLE=%{__pythondef}
mv doc/html %{buildroot}%{_pkgdocdir}/html
popd
@@ -2556,8 +2517,8 @@ pushd runtutorials
ln -s ../../files files
ln -sf ../../files/tutorials/df014_CsvDataSource_MuRun2010B.csv
popd
-pushd tmva/tmva/test/DNN/CNN
-ln -s ../../../../../../files files
+pushd tmva/tmva/test/DNN
+ln -s ../../../../../files files
popd
pushd tmva/tmva/test/envelope
ln -s ../../../../../files files
@@ -2578,32 +2539,41 @@ popd
# - tutorial-multicore-imt101_parTreeProcessing
# requires input data:
http://root.cern.ch/files/tp_process_imt.root (707 MB)
#
+# - gtest-tree-dataframe-test-datasource-sqlite
+# reads sqlite data over network:
+#
http://root.cern.ch/files/RSqliteDS_test.sqlite
+#
+# - tutorial-dataframe-df102_NanoAODDimuonAnalysis
+# - tutorial-dataframe-df103_NanoAODHiggsAnalysis
+# reads input data over network:
+# root://eospublic.cern.ch//eos/root-eos/cms_opendata_2012_nanoaod/
+#
# - tutorial-pythia-pythia8
# sometimes times out
-excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|tutorial-pythia-pythia8"
-
-%ifarch %{arm}
-# Tests failing on arm on Fedora <= 27
-#
https://sft.its.cern.ch/jira/browse/ROOT-8500
-# - test-stressiterators-interpreted
-# - tutorial-hist-sparsehist
-# - tutorial-r-*
-%if %{?fedora}%{!?fedora:0} <= 27 && %{?rhel}%{!?rhel:0} <= 7
-excluded="${excluded}|test-stressiterators-interpreted|tutorial-hist-sparsehist|tutorial-r-.*"
+excluded="test-stressIOPlugins-.*|tutorial-dataframe-df101_h1Analysis|tutorial-tree-run_h1analysis|tutorial-multicore-imt001_parBranchProcessing|tutorial-multicore-mp103_processSelector|tutorial-multicore-mp104_processH1|tutorial-multicore-mp105_processEntryList|tutorial-multicore-imt101_parTreeProcessing|gtest-tree-dataframe-test-datasource-sqlite|tutorial-dataframe-df102_NanoAODDimuonAnalysis|tutorial-dataframe-df103_NanoAODHiggsAnalysis|tutorial-pythia-pythia8"
+
+%ifarch %{ix86}
+%if %{?fedora}%{!?fedora:0} == 28
+# Test failing on ix86 on Fedora 28
+#
https://sft.its.cern.ch/jira/browse/ROOT-9893
+# - test-stressgeometry(-interpreted)
+excluded="${excluded}|test-stressgeometry"
%endif
%endif
%ifarch ppc64
# Tests failing on ppc64
#
https://sft.its.cern.ch/jira/browse/ROOT-6434
-# - test-stresshistogram[-interpreted]
-# - test-stressroostats[-interpreted]
-# - test-stresshistofit[-interpreted]
-# - tutorial-roofit-rf511_wsfactory_basic
+# - test-stresshistofit(-interpreted)
+# - test-stresshistogram(-interpreted)
+# - test-stressroostats(-interpreted)
+# - tutorial-dataframe-df006_ranges-py
+# - tutorial-roofit-rf203_ranges-py
+# - tutorial-roofit-rf511_wsfactory_basic(-py)
+# - tutorial-roofit-rf902_numgenconfig-py
# - tutorial-roostats-rs102_hypotestwithshapes (work on EPEL 7)
# - tutorial-roostats-rs701_BayesianCalculator
-# - tutorial-dataframe-df006_ranges-py
-excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistofit|tutorial-roofit-rf511_wsfactory_basic|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator|tutorial-dataframe-df006_ranges-py"
+excluded="${excluded}|test-stresshistofit|test-stresshistogram|test-stressroostats|tutorial-dataframe-df006_ranges-py|tutorial-roofit-rf203_ranges-py|tutorial-roofit-rf511_wsfactory_basic|tutorial-roofit-rf902_numgenconfig-py|tutorial-roostats-rs102_hypotestwithshapes|tutorial-roostats-rs701_BayesianCalculator"
%endif
make test ARGS="%{?_smp_mflags} --output-on-failure -E
\"${excluded}\""
@@ -2627,32 +2597,6 @@ update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||
:
gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
%endif
-%pre rootd
-# Remove old init config when systemd is used
-/sbin/chkconfig --del rootd >/dev/null 2>&1 || :
-
-%post rootd
-%systemd_post rootd.service
-
-%preun rootd
-%systemd_preun rootd.service
-
-%postun rootd
-%systemd_postun_with_restart rootd.service
-
-%pre proofd
-# Remove old init config when systemd is used
-/sbin/chkconfig --del proofd >/dev/null 2>&1 || :
-
-%post proofd
-%systemd_post proofd.service
-
-%preun proofd
-%systemd_preun proofd.service
-
-%postun proofd
-%systemd_postun_with_restart proofd.service
-
%post -n python2-%{name}
if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
grep -q %{_libdir}/%{name}/libPyROOT.so.%{version} \
@@ -2885,12 +2829,14 @@ end
%if %{root7}
%ldconfig_scriptlets graf-gpadv7
%ldconfig_scriptlets graf-primitives
+%ldconfig_scriptlets graf3d-eve7
%ldconfig_scriptlets gui-canvaspainter
%ldconfig_scriptlets gui-fitpanelv7
%ifarch %{qt5_qtwebengine_arches}
%ldconfig_scriptlets gui-qt5webdisplay
%endif
%ldconfig_scriptlets gui-webdisplay
+%ldconfig_scriptlets gui-webgui6
%ldconfig_scriptlets hist-draw
%endif
@@ -2901,13 +2847,11 @@ end
%{_bindir}/rootn.exe
%{_bindir}/roots
%{_bindir}/roots.exe
-%{_bindir}/ssh2rpd
%{_mandir}/man1/hadd.1*
%{_mandir}/man1/root.1*
%{_mandir}/man1/root.exe.1*
%{_mandir}/man1/rootn.exe.1*
%{_mandir}/man1/roots.exe.1*
-%{_mandir}/man1/ssh2rpd.1*
%{_datadir}/applications/root.desktop
%{_datadir}/icons/hicolor/48x48/apps/root.png
%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-root.png
@@ -3005,21 +2949,6 @@ end
%doc %{_pkgdocdir}/test
%doc %{_pkgdocdir}/tutorials
-%files proofd
-%{_bindir}/proofd
-%{_bindir}/proofserv
-%{_bindir}/proofserv.exe
-%{_bindir}/xpdtest
-%{_mandir}/man1/proofd.1*
-%{_mandir}/man1/proofserv.1*
-%{_mandir}/man1/xpdtest.1*
-%{_unitdir}/proofd.service
-
-%files rootd
-%{_bindir}/rootd
-%{_mandir}/man1/rootd.1*
-%{_unitdir}/rootd.service
-
%files -n python2-%{name} -f includelist-bindings-pyroot
%{_libdir}/%{name}/libPyROOT.rootmap
%{_libdir}/%{name}/libPyROOT.so
@@ -3526,7 +3455,6 @@ end
%{_datadir}/%{name}/plugins/TProof/P030_TProofLite.C
%{_datadir}/%{name}/plugins/TProof/P040_TProof.C
%{_datadir}/%{name}/valgrind-root.supp
-%doc %{_pkgdocdir}/README.PROOF
%files proof-bench -f includelist-proof-proofbench
%{_libdir}/%{name}/libProofBench.*
@@ -3547,10 +3475,6 @@ end
%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P050_TProofPlayerSuperMaster.C
%{_datadir}/%{name}/plugins/TVirtualProofPlayer/P060_TProofPlayerLite.C
-%files proof-pq2
-%{_bindir}/pq2*
-%{_mandir}/man1/pq2*.1*
-
%files proof-sessionviewer -f includelist-gui-sessionviewer
%{_libdir}/%{name}/libSessionViewer.*
%{_libdir}/%{name}/libSessionViewer_rdict.pcm
@@ -3560,7 +3484,12 @@ end
%files xproof -f includelist-proof-proofx
%{_bindir}/proofexecv
+%{_bindir}/proofserv
+%{_bindir}/proofserv.exe
+%{_bindir}/xpdtest
%{_bindir}/xproofd
+%{_mandir}/man1/proofserv.1*
+%{_mandir}/man1/xpdtest.1*
%{_mandir}/man1/xproofd.1*
%{_libdir}/%{name}/libProofx.*
%{_libdir}/%{name}/libProofx_rdict.pcm
@@ -3672,6 +3601,11 @@ end
%{_libdir}/%{name}/libROOTGraphicsPrimitives.*
%{_libdir}/%{name}/libROOTGraphicsPrimitives_rdict.pcm
+%files graf3d-eve7 -f includelist-graf3d-eve7
+%{_libdir}/%{name}/libROOTEve.*
+%{_libdir}/%{name}/libROOTEve_rdict.pcm
+%{_datadir}/%{name}/eve7
+
%files gui-canvaspainter
%{_libdir}/%{name}/libROOTCanvasPainter.*
@@ -3688,12 +3622,39 @@ end
%{_libdir}/%{name}/libROOTWebDisplay.*
%{_libdir}/%{name}/libROOTWebDisplay_rdict.pcm
+%files gui-webgui6 -f includelist-gui-webgui6
+%{_libdir}/%{name}/libWebGui6.*
+%{_libdir}/%{name}/libWebGui6_rdict.pcm
+%{_datadir}/%{name}/plugins/TGuiFactory/P030_TWebGuiFactory.C
+%{_datadir}/%{name}/plugins/TVirtualX/P060_TWebVirtualX.C
+
%files hist-draw -f includelist-hist-histdraw
%{_libdir}/%{name}/libROOTHistDraw.*
%{_libdir}/%{name}/libROOTHistDraw_rdict.pcm
%endif
%changelog
+* Mon Feb 11 2019 Mattias Ellert <ellert(a)ellert.physics.uu.se> - 6.16.00-1
+- Update to 6.16.00
+- Drop patches accepted upstream:
+ - root-adjust-allowed-test-difference-for-32-bit-ix86.patch
+ - root-crypto.patch
+ - root-js-syntax.patch
+ - root-missing-header.patch
+ - root-set-cache-file-dir.patch
+ - root-stressgraphics-ref.patch
+ - root-test-compilation-epel7.patch
+ - root-test-subdirs.patch
+ - root-unique-filenames.patch
+- Dropped subpackages:
+ - root-rootd (obsolete - use xrootd)
+ - root-proofd (obsolete - use root-xproofd)
+ - root-proof-pq2
+- New ROOT 7 subpackage:
+ - root-graf3d-eve7
+ - root-gui-webgui6
+- Make tutorial/v7/line.cxx run in batch mode
+
* Mon Feb 04 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.14.08-4
- Remove obsolete /sbin/ldconfig scriptlets
- The root-core package installs a file in /etc/ld.so.conf.d, so it should
@@ -3780,10 +3741,10 @@ end
- root-io-xmlparser from root-io-xml
- root-proof-player from root-proof
- New ROOT 7 subpackages
- - graf-gpadv7
- - graf-primitives
- - gui-fitpanelv7
- - gui-qt5webdisplay
+ - root-graf-gpadv7
+ - root-graf-primitives
+ - root-gui-fitpanelv7
+ - root-gui-qt5webdisplay
- Rename root-guibuilder package to root-gui-builder
- Create empty .dist-info files so that rpm auto-generates provides
diff --git a/rootd.service b/rootd.service
deleted file mode 100644
index 596a3f9..0000000
--- a/rootd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=ROOT file server daemon
-Documentation=man:rootd(8)
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/rootd
-ExecStart=/usr/bin/rootd $ROOTDOPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources b/sources
index 24f942a..bbb7292 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (root-6.14.08.tar.xz) =
609139b2e148d5a10f41923f33fa288d9e3bc56f79d741b8b9df98f46556b83244ad71b9f2fd30cf6675a0cc9c46fa3d8e6bfe979c734bb10cec29e60dd8436a
-SHA512 (root-testfiles.tar.xz) =
22b85815a49a0acec13b4dc160cac0712398df1ec7b0a0bf9b01f31c72538f356190e386fb7a37cd797a3bff1c04a52567761b8b3720790de96f515596ceeea2
+SHA512 (root-6.16.00.tar.xz) =
2e8906f8cf7c4c434e5e695c379f34aee3f421e6370ccff42dcd4519e281c3844760957f434b737c21f2b5bdf86deaf3928a67e1b952b424f2954d2c6a98ee0b
+SHA512 (root-testfiles.tar.xz) =
309231f065f4165b28816f2f511830077f3d1bf8920800b2390bf956481753b304db85719b251e862376bc94a65b3319cff7383fdf9b2a949dc9d7cf0d0114d5
commit 85f4c754b6c004e1e75d6193c68278ad59a765ad
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Mon Feb 4 22:12:56 2019 +0100
Remove obsolete /sbin/ldconfig scriptlets
The root-core package installs a file in /etc/ld.so.conf.d, so it should
always call /sbin/ldconfig and not use the macros
diff --git a/root.spec b/root.spec
index 4353d44..04665e9 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
Name: root
Version: 6.14.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Numerical data analysis framework
License: LGPLv2+
@@ -2668,7 +2668,7 @@ fi
%{_sbindir}/update-alternatives --install \
%{_libdir}/%{name}/libPyROOT.so.%{version} \
libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
-/sbin/ldconfig
+%{?ldconfig}
%preun -n python2-%{name}
if [ $1 = 0 ] ; then
@@ -2676,7 +2676,7 @@ if [ $1 = 0 ] ; then
libPyROOT.so %{python2_sitearch}/libPyROOT.so
fi
-%postun -n python2-%{name} -p /sbin/ldconfig
+%ldconfig_postun -n python2-%{name}
%triggerpostun -n python2-%{name} -- %{name}-python
# Uninstalling the old %{name}-python will remove the alternatives
@@ -2684,7 +2684,7 @@ fi
%{_sbindir}/update-alternatives --install \
%{_libdir}/%{name}/libPyROOT.so.%{version} \
libPyROOT.so %{python2_sitearch}/libPyROOT.so %{py2prio}
-/sbin/ldconfig
+%{?ldconfig}
%post -n python%{python3_pkgversion}-%{name}
if [ -r /var/lib/alternatives/libPyROOT.so ] ; then
@@ -2706,7 +2706,7 @@ fi
%{_sbindir}/update-alternatives --install \
%{_libdir}/%{name}/libPyROOT.so.%{version} \
libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
-/sbin/ldconfig
+%{?ldconfig}
%preun -n python%{python3_pkgversion}-%{name}
if [ $1 = 0 ] ; then
@@ -2714,7 +2714,7 @@ if [ $1 = 0 ] ; then
libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so
fi
-%postun -n python%{python3_pkgversion}-%{name} -p /sbin/ldconfig
+%ldconfig_postun -n python%{python3_pkgversion}-%{name}
%triggerpostun -n python%{python3_pkgversion}-%{name} --
%{name}-python%{python3_pkgversion}
# Uninstalling the old %{name}-python%{python3_pkgversion} will remove the alternatives
@@ -2722,7 +2722,7 @@ fi
%{_sbindir}/update-alternatives --install \
%{_libdir}/%{name}/libPyROOT.so.%{version} \
libPyROOT.so %{python3_sitearch}/libPyROOT.%{py3_soabi}.so %{py3prio}
-/sbin/ldconfig
+%{?ldconfig}
%if %{?rhel}%{!?rhel:0} == 7
%post -n python%{python3_other_pkgversion}-%{name}
@@ -2741,7 +2741,7 @@ fi
%{_sbindir}/update-alternatives --install \
%{_libdir}/%{name}/libPyROOT.so.%{version} \
libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so 5
-/sbin/ldconfig
+%{?ldconfig}
%preun -n python%{python3_other_pkgversion}-%{name}
if [ $1 = 0 ] ; then
@@ -2749,7 +2749,7 @@ if [ $1 = 0 ] ; then
libPyROOT.so %{python3_other_sitearch}/libPyROOT.%{py3_other_soabi}.so
fi
-%postun -n python%{python3_other_pkgversion}-%{name} -p /sbin/ldconfig
+%ldconfig_postun -n python%{python3_other_pkgversion}-%{name}
%endif
%post notebook
@@ -2774,7 +2774,9 @@ if [ $1 -eq 0 ] ; then
fi
fi
-%ldconfig_scriptlets core
+%post core -p /sbin/ldconfig
+%postun core -p /sbin/ldconfig
+
%ldconfig_scriptlets multiproc
%ldconfig_scriptlets cling
%ldconfig_scriptlets r
@@ -3692,6 +3694,11 @@ end
%endif
%changelog
+* Mon Feb 04 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.14.08-4
+- Remove obsolete /sbin/ldconfig scriptlets
+- The root-core package installs a file in /etc/ld.so.conf.d, so it should
+ always call /sbin/ldconfig and not use the macros
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org>
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 0aea483c48b496acf44cc45ec33dc5c8bcea439b
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Mon Feb 4 21:57:42 2019 +0100
Revert "Remove obsolete scriptlets"
The old version already removed the obsolete scriptlets where appropriate
(i.e. everywhere except for EPEL 7), there was no need to change it.
The new version introduced an error that made the specfile unparsable,
which resulted in that the package failed to build during the Fedora 30
mass rebuild.
This reverts commit f5cfd58b12102b3bc49ae720756b87d7eb1cbc2b.
diff --git a/root.spec b/root.spec
index b1f976a..4353d44 100644
--- a/root.spec
+++ b/root.spec
@@ -2609,7 +2609,7 @@
excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistof
make test ARGS="%{?_smp_mflags} --output-on-failure -E
\"${excluded}\""
popd
-%if %{?rhel} && 0%{?rhel} <= 7
+%if %{?rhel}%{!?rhel:0} == 7
%post
touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
update-desktop-database >/dev/null 2>&1 || :
commit 786482506c647ff72646e7bd88c844a43a77dee7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 11:31:06 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/root.spec b/root.spec
index c629aa1..b1f976a 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
Name: root
Version: 6.14.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Numerical data analysis framework
License: LGPLv2+
@@ -3692,6 +3692,9 @@ end
%endif
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org>
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 6.14.08-2
- Rebuilt for libcrypt.so.2 (#1666033)
commit f5cfd58b12102b3bc49ae720756b87d7eb1cbc2b
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Jan 27 13:14:43 2019 +0100
Remove obsolete scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/root.spec b/root.spec
index 0899bf8..c629aa1 100644
--- a/root.spec
+++ b/root.spec
@@ -2609,7 +2609,7 @@
excluded="${excluded}|test-stresshistogram|test-stressroostats|test-stresshistof
make test ARGS="%{?_smp_mflags} --output-on-failure -E
\"${excluded}\""
popd
-%if %{?rhel}%{!?rhel:0} == 7
+%if %{?rhel} && 0%{?rhel} <= 7
%post
touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || :
update-desktop-database >/dev/null 2>&1 || :
commit cd31cb5a9783f05dce633b3846508b723a519631
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jan 22 18:40:52 2019 +0100
Remove obsolete ldconfig scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/root.spec b/root.spec
index 352faa6..0899bf8 100644
--- a/root.spec
+++ b/root.spec
@@ -2774,158 +2774,83 @@ if [ $1 -eq 0 ] ; then
fi
fi
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
-%post multiproc -p /sbin/ldconfig
-%postun multiproc -p /sbin/ldconfig
-%post cling -p /sbin/ldconfig
-%postun cling -p /sbin/ldconfig
-%post r -p /sbin/ldconfig
-%postun r -p /sbin/ldconfig
-%post r-tools -p /sbin/ldconfig
-%postun r-tools -p /sbin/ldconfig
-%post genetic -p /sbin/ldconfig
-%postun genetic -p /sbin/ldconfig
-%post geom -p /sbin/ldconfig
-%postun geom -p /sbin/ldconfig
-%post gdml -p /sbin/ldconfig
-%postun gdml -p /sbin/ldconfig
-%post geocad -p /sbin/ldconfig
-%postun geocad -p /sbin/ldconfig
-%post graf -p /sbin/ldconfig
-%postun graf -p /sbin/ldconfig
-%post graf-asimage -p /sbin/ldconfig
-%postun graf-asimage -p /sbin/ldconfig
-%post graf-fitsio -p /sbin/ldconfig
-%postun graf-fitsio -p /sbin/ldconfig
-%post graf-gpad -p /sbin/ldconfig
-%postun graf-gpad -p /sbin/ldconfig
-%post graf-gviz -p /sbin/ldconfig
-%postun graf-gviz -p /sbin/ldconfig
-%post graf-postscript -p /sbin/ldconfig
-%postun graf-postscript -p /sbin/ldconfig
-%post graf-qt -p /sbin/ldconfig
-%postun graf-qt -p /sbin/ldconfig
-%post graf-x11 -p /sbin/ldconfig
-%postun graf-x11 -p /sbin/ldconfig
-%post graf3d -p /sbin/ldconfig
-%postun graf3d -p /sbin/ldconfig
-%post graf3d-eve -p /sbin/ldconfig
-%postun graf3d-eve -p /sbin/ldconfig
-%post graf3d-gl -p /sbin/ldconfig
-%postun graf3d-gl -p /sbin/ldconfig
-%post graf3d-gviz3d -p /sbin/ldconfig
-%postun graf3d-gviz3d -p /sbin/ldconfig
-%post graf3d-x3d -p /sbin/ldconfig
-%postun graf3d-x3d -p /sbin/ldconfig
-%post gui -p /sbin/ldconfig
-%postun gui -p /sbin/ldconfig
-%post gui-html -p /sbin/ldconfig
-%postun gui-html -p /sbin/ldconfig
-%post gui-fitpanel -p /sbin/ldconfig
-%postun gui-fitpanel -p /sbin/ldconfig
-%post gui-ged -p /sbin/ldconfig
-%postun gui-ged -p /sbin/ldconfig
-%post gui-builder -p /sbin/ldconfig
-%postun gui-builder -p /sbin/ldconfig
-%post gui-qt -p /sbin/ldconfig
-%postun gui-qt -p /sbin/ldconfig
-%post gui-qtgsi -p /sbin/ldconfig
-%postun gui-qtgsi -p /sbin/ldconfig
-%post gui-recorder -p /sbin/ldconfig
-%postun gui-recorder -p /sbin/ldconfig
-%post hbook -p /sbin/ldconfig
-%postun hbook -p /sbin/ldconfig
-%post hist -p /sbin/ldconfig
-%postun hist -p /sbin/ldconfig
-%post hist-painter -p /sbin/ldconfig
-%postun hist-painter -p /sbin/ldconfig
-%post spectrum -p /sbin/ldconfig
-%postun spectrum -p /sbin/ldconfig
-%post spectrum-painter -p /sbin/ldconfig
-%postun spectrum-painter -p /sbin/ldconfig
-%post hist-factory -p /sbin/ldconfig
-%postun hist-factory -p /sbin/ldconfig
-%post html -p /sbin/ldconfig
-%postun html -p /sbin/ldconfig
-%post io -p /sbin/ldconfig
-%postun io -p /sbin/ldconfig
-%post io-dcache -p /sbin/ldconfig
-%postun io-dcache -p /sbin/ldconfig
-%post io-gfal -p /sbin/ldconfig
-%postun io-gfal -p /sbin/ldconfig
+%ldconfig_scriptlets core
+%ldconfig_scriptlets multiproc
+%ldconfig_scriptlets cling
+%ldconfig_scriptlets r
+%ldconfig_scriptlets r-tools
+%ldconfig_scriptlets genetic
+%ldconfig_scriptlets geom
+%ldconfig_scriptlets gdml
+%ldconfig_scriptlets geocad
+%ldconfig_scriptlets graf
+%ldconfig_scriptlets graf-asimage
+%ldconfig_scriptlets graf-fitsio
+%ldconfig_scriptlets graf-gpad
+%ldconfig_scriptlets graf-gviz
+%ldconfig_scriptlets graf-postscript
+%ldconfig_scriptlets graf-qt
+%ldconfig_scriptlets graf-x11
+%ldconfig_scriptlets graf3d
+%ldconfig_scriptlets graf3d-eve
+%ldconfig_scriptlets graf3d-gl
+%ldconfig_scriptlets graf3d-gviz3d
+%ldconfig_scriptlets graf3d-x3d
+%ldconfig_scriptlets gui
+%ldconfig_scriptlets gui-html
+%ldconfig_scriptlets gui-fitpanel
+%ldconfig_scriptlets gui-ged
+%ldconfig_scriptlets gui-builder
+%ldconfig_scriptlets gui-qt
+%ldconfig_scriptlets gui-qtgsi
+%ldconfig_scriptlets gui-recorder
+%ldconfig_scriptlets hbook
+%ldconfig_scriptlets hist
+%ldconfig_scriptlets hist-painter
+%ldconfig_scriptlets spectrum
+%ldconfig_scriptlets spectrum-painter
+%ldconfig_scriptlets hist-factory
+%ldconfig_scriptlets html
+%ldconfig_scriptlets io
+%ldconfig_scriptlets io-dcache
+%ldconfig_scriptlets io-gfal
%if %{hadoop}
-%post io-hdfs -p /sbin/ldconfig
-%postun io-hdfs -p /sbin/ldconfig
+%ldconfig_scriptlets io-hdfs
%endif
-%post io-rfio -p /sbin/ldconfig
-%postun io-rfio -p /sbin/ldconfig
-%post io-sql -p /sbin/ldconfig
-%postun io-sql -p /sbin/ldconfig
-%post io-xml -p /sbin/ldconfig
-%postun io-xml -p /sbin/ldconfig
-%post io-xmlparser -p /sbin/ldconfig
-%postun io-xmlparser -p /sbin/ldconfig
-%post foam -p /sbin/ldconfig
-%postun foam -p /sbin/ldconfig
-%post fftw -p /sbin/ldconfig
-%postun fftw -p /sbin/ldconfig
-%post fumili -p /sbin/ldconfig
-%postun fumili -p /sbin/ldconfig
-%post genvector -p /sbin/ldconfig
-%postun genvector -p /sbin/ldconfig
-%post mathcore -p /sbin/ldconfig
-%postun mathcore -p /sbin/ldconfig
-%post mathmore -p /sbin/ldconfig
-%postun mathmore -p /sbin/ldconfig
-%post matrix -p /sbin/ldconfig
-%postun matrix -p /sbin/ldconfig
-%post minuit -p /sbin/ldconfig
-%postun minuit -p /sbin/ldconfig
-%post minuit2 -p /sbin/ldconfig
-%postun minuit2 -p /sbin/ldconfig
-%post mlp -p /sbin/ldconfig
-%postun mlp -p /sbin/ldconfig
-%post physics -p /sbin/ldconfig
-%postun physics -p /sbin/ldconfig
-%post quadp -p /sbin/ldconfig
-%postun quadp -p /sbin/ldconfig
-%post smatrix -p /sbin/ldconfig
-%postun smatrix -p /sbin/ldconfig
-%post splot -p /sbin/ldconfig
-%postun splot -p /sbin/ldconfig
-%post unuran -p /sbin/ldconfig
-%postun unuran -p /sbin/ldconfig
-%post vecops -p /sbin/ldconfig
-%postun vecops -p /sbin/ldconfig
-%post memstat -p /sbin/ldconfig
-%postun memstat -p /sbin/ldconfig
-%post table -p /sbin/ldconfig
-%postun table -p /sbin/ldconfig
-%post montecarlo-eg -p /sbin/ldconfig
-%postun montecarlo-eg -p /sbin/ldconfig
-%post montecarlo-pythia8 -p /sbin/ldconfig
-%postun montecarlo-pythia8 -p /sbin/ldconfig
-%post montecarlo-vmc -p /sbin/ldconfig
-%postun montecarlo-vmc -p /sbin/ldconfig
-%post net -p /sbin/ldconfig
-%postun net -p /sbin/ldconfig
-%post net-rpdutils -p /sbin/ldconfig
-%postun net-rpdutils -p /sbin/ldconfig
-%post net-bonjour -p /sbin/ldconfig
-%postun net-bonjour -p /sbin/ldconfig
-%post net-auth -p /sbin/ldconfig
-%postun net-auth -p /sbin/ldconfig
-%post net-davix -p /sbin/ldconfig
-%postun net-davix -p /sbin/ldconfig
-%post net-globus -p /sbin/ldconfig
-%postun net-globus -p /sbin/ldconfig
-%post net-krb5 -p /sbin/ldconfig
-%postun net-krb5 -p /sbin/ldconfig
-%post net-ldap -p /sbin/ldconfig
-%postun net-ldap -p /sbin/ldconfig
-%post net-http -p /sbin/ldconfig
-%postun net-http -p /sbin/ldconfig
+%ldconfig_scriptlets io-rfio
+%ldconfig_scriptlets io-sql
+%ldconfig_scriptlets io-xml
+%ldconfig_scriptlets io-xmlparser
+%ldconfig_scriptlets foam
+%ldconfig_scriptlets fftw
+%ldconfig_scriptlets fumili
+%ldconfig_scriptlets genvector
+%ldconfig_scriptlets mathcore
+%ldconfig_scriptlets mathmore
+%ldconfig_scriptlets matrix
+%ldconfig_scriptlets minuit
+%ldconfig_scriptlets minuit2
+%ldconfig_scriptlets mlp
+%ldconfig_scriptlets physics
+%ldconfig_scriptlets quadp
+%ldconfig_scriptlets smatrix
+%ldconfig_scriptlets splot
+%ldconfig_scriptlets unuran
+%ldconfig_scriptlets vecops
+%ldconfig_scriptlets memstat
+%ldconfig_scriptlets table
+%ldconfig_scriptlets montecarlo-eg
+%ldconfig_scriptlets montecarlo-pythia8
+%ldconfig_scriptlets montecarlo-vmc
+%ldconfig_scriptlets net
+%ldconfig_scriptlets net-rpdutils
+%ldconfig_scriptlets net-bonjour
+%ldconfig_scriptlets net-auth
+%ldconfig_scriptlets net-davix
+%ldconfig_scriptlets net-globus
+%ldconfig_scriptlets net-krb5
+%ldconfig_scriptlets net-ldap
+%ldconfig_scriptlets net-http
%pretrans net-http -p <lua>
path = "%{_datadir}/%{name}/http"
@@ -2934,65 +2859,37 @@ if st and st.type == "directory" then
os.execute("rm -rf " .. path)
end
-%post net-httpsniff -p /sbin/ldconfig
-%postun net-httpsniff -p /sbin/ldconfig
-%post netx -p /sbin/ldconfig
-%postun netx -p /sbin/ldconfig
-%post proof -p /sbin/ldconfig
-%postun proof -p /sbin/ldconfig
-%post proof-bench -p /sbin/ldconfig
-%postun proof-bench -p /sbin/ldconfig
-%post proof-player -p /sbin/ldconfig
-%postun proof-player -p /sbin/ldconfig
-%post proof-sessionviewer -p /sbin/ldconfig
-%postun proof-sessionviewer -p /sbin/ldconfig
-%post xproof -p /sbin/ldconfig
-%postun xproof -p /sbin/ldconfig
-%post roofit -p /sbin/ldconfig
-%postun roofit -p /sbin/ldconfig
-%post sql-mysql -p /sbin/ldconfig
-%postun sql-mysql -p /sbin/ldconfig
-%post sql-odbc -p /sbin/ldconfig
-%postun sql-odbc -p /sbin/ldconfig
-%post sql-sqlite -p /sbin/ldconfig
-%postun sql-sqlite -p /sbin/ldconfig
-%post sql-pgsql -p /sbin/ldconfig
-%postun sql-pgsql -p /sbin/ldconfig
-%post tmva -p /sbin/ldconfig
-%postun tmva -p /sbin/ldconfig
-%post tmva-python -p /sbin/ldconfig
-%postun tmva-python -p /sbin/ldconfig
-%post tmva-r -p /sbin/ldconfig
-%postun tmva-r -p /sbin/ldconfig
-%post tmva-gui -p /sbin/ldconfig
-%postun tmva-gui -p /sbin/ldconfig
-%post tree -p /sbin/ldconfig
-%postun tree -p /sbin/ldconfig
-%post tree-dataframe -p /sbin/ldconfig
-%postun tree-dataframe -p /sbin/ldconfig
-%post tree-player -p /sbin/ldconfig
-%postun tree-player -p /sbin/ldconfig
-%post tree-viewer -p /sbin/ldconfig
-%postun tree-viewer -p /sbin/ldconfig
-%post unfold -p /sbin/ldconfig
-%postun unfold -p /sbin/ldconfig
+%ldconfig_scriptlets net-httpsniff
+%ldconfig_scriptlets netx
+%ldconfig_scriptlets proof
+%ldconfig_scriptlets proof-bench
+%ldconfig_scriptlets proof-player
+%ldconfig_scriptlets proof-sessionviewer
+%ldconfig_scriptlets xproof
+%ldconfig_scriptlets roofit
+%ldconfig_scriptlets sql-mysql
+%ldconfig_scriptlets sql-odbc
+%ldconfig_scriptlets sql-sqlite
+%ldconfig_scriptlets sql-pgsql
+%ldconfig_scriptlets tmva
+%ldconfig_scriptlets tmva-python
+%ldconfig_scriptlets tmva-r
+%ldconfig_scriptlets tmva-gui
+%ldconfig_scriptlets tree
+%ldconfig_scriptlets tree-dataframe
+%ldconfig_scriptlets tree-player
+%ldconfig_scriptlets tree-viewer
+%ldconfig_scriptlets unfold
%if %{root7}
-%post graf-gpadv7 -p /sbin/ldconfig
-%postun graf-gpadv7 -p /sbin/ldconfig
-%post graf-primitives -p /sbin/ldconfig
-%postun graf-primitives -p /sbin/ldconfig
-%post gui-canvaspainter -p /sbin/ldconfig
-%postun gui-canvaspainter -p /sbin/ldconfig
-%post gui-fitpanelv7 -p /sbin/ldconfig
-%postun gui-fitpanelv7 -p /sbin/ldconfig
+%ldconfig_scriptlets graf-gpadv7
+%ldconfig_scriptlets graf-primitives
+%ldconfig_scriptlets gui-canvaspainter
+%ldconfig_scriptlets gui-fitpanelv7
%ifarch %{qt5_qtwebengine_arches}
-%post gui-qt5webdisplay -p /sbin/ldconfig
-%postun gui-qt5webdisplay -p /sbin/ldconfig
+%ldconfig_scriptlets gui-qt5webdisplay
%endif
-%post gui-webdisplay -p /sbin/ldconfig
-%postun gui-webdisplay -p /sbin/ldconfig
-%post hist-draw -p /sbin/ldconfig
-%postun hist-draw -p /sbin/ldconfig
+%ldconfig_scriptlets gui-webdisplay
+%ldconfig_scriptlets hist-draw
%endif
%files
commit dccdfa53974b59d18fc5146073c0d5c86452182a
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Jan 14 19:15:11 2019 +0100
Rebuilt for libcrypt.so.2 (#1666033)
diff --git a/root.spec b/root.spec
index 07a1214..352faa6 100644
--- a/root.spec
+++ b/root.spec
@@ -46,7 +46,7 @@
Name: root
Version: 6.14.08
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Numerical data analysis framework
License: LGPLv2+
@@ -3795,6 +3795,9 @@ end
%endif
%changelog
+* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 6.14.08-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
* Fri Nov 23 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 6.14.08-1
- Update to 6.14.08
- Make tutorial filenames unique to avoid overwrites