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=245e52da342db471....
Change: -%ifarch ppc64le
Thanks.
Full change: ============
commit 245e52da342db471422f7ba901885ed09305317a Author: Mattias Ellert mattias.ellert@physics.uu.se Date: Sun Apr 5 12:50:43 2020 +0200
Update to 6.20.04 Drop previously backported patch root-tutorials-unique-filenames.patch Improved patch for the PyROOT issue on EPEL 7 ppc64le
diff --git a/root-epel7-ppc64le-pyroot.patch b/root-epel7-ppc64le-pyroot.patch index 2d9c400..d046855 100644 --- a/root-epel7-ppc64le-pyroot.patch +++ b/root-epel7-ppc64le-pyroot.patch @@ -1,6 +1,6 @@ diff -ur root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx root-6.20.02/bindings/pyroot/src/Cppyy.cxx --- root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx 2020-03-15 16:21:25.000000000 +0100 -+++ root-6.20.02/bindings/pyroot/src/Cppyy.cxx 2020-03-21 14:10:09.322489811 +0100 ++++ root-6.20.02/bindings/pyroot/src/Cppyy.cxx 2020-03-24 19:26:38.162272398 +0100 @@ -74,10 +74,6 @@ class ApplicationStarter { public: @@ -12,12 +12,62 @@ diff -ur root-6.20.02.orig/bindings/pyroot/src/Cppyy.cxx root-6.20.02/bindings/p // setup dummy holders for global and std namespaces assert( g_classrefs.size() == GLOBAL_HANDLE ); g_name2classrefidx[ "" ] = GLOBAL_HANDLE; -@@ -90,8 +86,6 @@ - } +diff -ur root-6.20.02.orig/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx root-6.20.02/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx +--- root-6.20.02.orig/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx 2020-03-15 16:21:25.000000000 +0100 ++++ root-6.20.02/bindings/pyroot_experimental/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx 2020-03-24 19:26:38.182272186 +0100 +@@ -109,10 +109,6 @@ + class ApplicationStarter { + public: + ApplicationStarter() { +- // Insure ROOT's atexit is executed *after* the atexit that calls +- // ApplicationStarter's destructor, by forcing the ROOT's atexit +- // registration now. +- TROOT::Initialize(); + // setup dummy holders for global and std namespaces + assert(g_classrefs.size() == GLOBAL_HANDLE); + g_name2classrefidx[""] = GLOBAL_HANDLE; +diff -ur root-6.20.02.orig/core/base/inc/TROOT.h root-6.20.02/core/base/inc/TROOT.h +--- root-6.20.02.orig/core/base/inc/TROOT.h 2020-03-15 16:21:25.000000000 +0100 ++++ root-6.20.02/core/base/inc/TROOT.h 2020-03-24 19:26:38.182272186 +0100 +@@ -351,7 +351,6 @@ + static void SetMacroPath(const char *newpath); + static Int_t IncreaseDirLevel(); + static void IndentLevel(); +- static void Initialize(); + static Bool_t Initialized(); + static Bool_t MemCheck(); + static void SetDirLevel(Int_t level = 0); +diff -ur root-6.20.02.orig/core/base/src/TROOT.cxx root-6.20.02/core/base/src/TROOT.cxx +--- root-6.20.02.orig/core/base/src/TROOT.cxx 2020-03-15 16:21:25.000000000 +0100 ++++ root-6.20.02/core/base/src/TROOT.cxx 2020-03-24 20:10:54.640084486 +0100 +@@ -1022,10 +1022,12 @@ + SafeDelete(fCleanups); + #endif + +-#ifndef _MSC_VER +- // deleting the interpreter makes things crash at exit in some cases +- delete fInterpreter; +-#endif ++ // llvm::TimingGroup used for measuring the timing relies the destructors. ++ // In order to make use of this feature we have to call the destructor of ++ // TCling which will shut down clang, cling and llvm. ++ // gSystem->Getenv is not available anymore. ++ if (::getenv("ROOT_CLING_TIMING")) ++ delete fInterpreter; + + // Prints memory stats + TStorage::PrintStatistics(); +@@ -2848,13 +2850,6 @@ + }
- ~ApplicationStarter() { -- for ( auto ifunc : g_method2callfunc ) -- gInterpreter->CallFunc_Delete( ifunc.second ); - } - } _applicationStarter; + //////////////////////////////////////////////////////////////////////////////// +-/// Initialize ROOT explicitly. +- +-void TROOT::Initialize() { +- (void) gROOT; +-} +- +-//////////////////////////////////////////////////////////////////////////////// + /// Return kTRUE if the TROOT object has been initialized.
+ Bool_t TROOT::Initialized() diff --git a/root-tutorials-unique-filenames.patch b/root-tutorials-unique-filenames.patch deleted file mode 100644 index dee82fb..0000000 --- a/root-tutorials-unique-filenames.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tutorials/multicore/mtbb101_fillNtuples.C b/tutorials/multicore/mtbb101_fillNtuples.C -index 80c19ce626..d7a9dbbdaa 100644 ---- a/tutorials/multicore/mtbb101_fillNtuples.C -+++ b/tutorials/multicore/mtbb101_fillNtuples.C -@@ -40,7 +40,7 @@ Int_t mtbb101_fillNtuples() - - // Create a random generator and and Ntuple to hold the numbers - TRandom3 rndm(1); -- TFile ofile("mp101_singleCore.root", "RECREATE"); -+ TFile ofile("mtbb101_singleCore.root", "RECREATE"); - TNtuple randomNumbers("singleCore", "Random Numbers", "r"); - fillRandom(randomNumbers, rndm, nNumbers); - randomNumbers.Write(); -@@ -52,7 +52,7 @@ Int_t mtbb101_fillNtuples() - auto workItem = [](UInt_t workerID) { - // One generator, file and ntuple per worker - TRandom3 workerRndm(workerID); // Change the seed -- TFile ofile(Form("mp101_multiCore_%u.root", workerID), "RECREATE"); -+ TFile ofile(Form("mtbb101_multiCore_%u.root", workerID), "RECREATE"); - TNtuple workerRandomNumbers("multiCore", "Random Numbers", "r"); - fillRandom(workerRandomNumbers, workerRndm, workSize); - workerRandomNumbers.Write(); diff --git a/root.spec b/root.spec index 7a79f82..65e8296 100644 --- a/root.spec +++ b/root.spec @@ -49,7 +49,7 @@ %global __provides_exclude_from ^(%{?python2_sitearch:%{python2_sitearch}|}%{python3_sitearch}%{?python3_other_sitearch:|%{python3_other_sitearch}})/libJupyROOT\.so$
Name: root -Version: 6.20.02 +Version: 6.20.04 %global libversion %(cut -d. -f 1-2 <<< %{version}) Release: 1%{?dist} Summary: Numerical data analysis framework @@ -117,22 +117,18 @@ Patch15: %{name}-FitData-assert-fix.patch # modifies it # https://github.com/root-project/root/pull/5160 Patch16: %{name}-xmlmodify-dep.patch -# Use unique filenames in tutorials so they can be run in -# parallel -# Backport from upstream's git -Patch17: %{name}-tutorials-unique-filenames.patch # Size types should use %z # https://github.com/root-project/root/pull/5161 -Patch18: %{name}-format-fix.patch +Patch17: %{name}-format-fix.patch # Run some test on 32 bit that upstream has disabled -Patch19: %{name}-32bit-tests.patch +Patch18: %{name}-32bit-tests.patch # The file was moved - update path # https://github.com/root-project/root/pull/5162 -Patch20: %{name}-moved-file.patch +Patch19: %{name}-moved-file.patch # Workaround for initialization problems for PyROOT on # EPEL7 ppc64le # https://sft.its.cern.ch/jira/browse/ROOT-10622 -Patch21: %{name}-epel7-ppc64le-pyroot.patch +Patch20: %{name}-epel7-ppc64le-pyroot.patch
# s390x suffers from endian issues resulting in failing tests # and broken documentation generation @@ -1847,11 +1843,6 @@ This package contains an ntuple extension for ROOT 7. %patch18 -p1 %patch19 -p1 %patch20 -p1 -%if %{?rhel}%{!?rhel:0} == 7 -%ifarch ppc64le -%patch21 -p1 -%endif -%endif
# Remove bundled sources in order to be sure they are not used # * afterimage @@ -3790,6 +3781,11 @@ fi %endif
%changelog +* Wed Apr 01 2020 Mattias Ellert mattias.ellert@physics.uu.se - 6.20.04-1 +- Update to 6.20.04 +- Drop previously backported patch root-tutorials-unique-filenames.patch +- Improved patch for the PyROOT issue on EPEL 7 ppc64le + * Sun Mar 22 2020 Mattias Ellert mattias.ellert@physics.uu.se - 6.20.02-1 - Update to 6.20.02 - Drop patches accepted upstream diff --git a/sources b/sources index 0372c45..acda19b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (root-6.20.02.tar.xz) = 65f60c52485e72ef405daf10fa08a2d453c7f72f5f3721b97762094713dad1b0f5cb5a37a2a1c30f78bf97c358679f71829bc16833914e6f2ba82e9165521581 +SHA512 (root-6.20.04.tar.xz) = 9e864e1b4c772871bdadec53b40ccce05fd537f04321b301ca78ad1e711e332b278e76bcd7673a6a11ef4dbac18bee8c24ae65cc7fe962e5e8b63630bdc62f27 SHA512 (root-testfiles.tar.xz) = 7006c6591b587c24cf75dc4f6ed9586165b27102539fdde580d0a95853fcec7e9980a881e49e64a09f90af341a8c8fd2f493305ed88e07af144fabd438ba283e