From 8c8b88f79b45547ad05310e509fe9b9084c03abd Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Jun 20 2016 13:38:08 +0000 Subject: Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport) - Minor updates to patches - mostly backported from upstream - Reenable hadoop/hdfs support for F24+ --- diff --git a/root-broken-cmake-config.patch b/root-broken-cmake-config.patch index d21a76e..c1bf91f 100644 --- a/root-broken-cmake-config.patch +++ b/root-broken-cmake-config.patch @@ -28,29 +28,43 @@ diff -Nur root-6.06.02.orig/cmake/modules/FindDPM.cmake root-6.06.02/cmake/modul diff -Nur root-6.06.02.orig/cmake/modules/FindGFAL.cmake root-6.06.02/cmake/modules/FindGFAL.cmake --- root-6.06.02.orig/cmake/modules/FindGFAL.cmake 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/cmake/modules/FindGFAL.cmake 2016-03-20 17:08:52.162461425 +0100 -@@ -6,15 +6,18 @@ +@@ -4,17 +4,29 @@ + # GFAL_FOUND + # GFAL_INCLUDE_DIR # GFAL_INCLUDE_DIRS (not cached) - # GFAL_LIBRARIES +-# GFAL_LIBRARIES ++# GFAL_LIBRARIES (not cached) -find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include) -+find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include /usr/include/gfal2 /usr/include) - find_library(GFAL_LIBRARIES NAMES gfal gfal2 HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib) +-find_library(GFAL_LIBRARIES NAMES gfal gfal2 HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib) -find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include) -+find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include /usr/include) ++find_path(GFAL_INCLUDE_DIR NAMES gfal_api.h ++ PATH_SUFFIXES . gfal gfal2 ++ HINTS ${GFAL_DIR}/include $ENV{GFAL_DIR}/include) ++find_library(GFAL_LIBRARY NAMES gfal gfal2 ++ HINTS ${GFAL_DIR}/lib $ENV{GFAL_DIR}/lib) ++find_path(SRM_IFCE_INCLUDE_DIR gfal_srm_ifce_types.h ++ HINTS ${SRM_IFCE_DIR}/include $ENV{SRM_IFCE_DIR}/include) --set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR}) -+find_package(PkgConfig) -+pkg_check_modules (GLIB2 glib-2.0) -+ -+set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}) ++set(GFAL_LIBRARIES ${GFAL_LIBRARY}) + set(GFAL_INCLUDE_DIRS ${GFAL_INCLUDE_DIR} ${SRM_IFCE_INCLUDE_DIR}) ++if(GFAL_LIBRARY MATCHES gfal2) ++ # use pkg-config to get the directories for glib and then use these values ++ find_package(PkgConfig) ++ pkg_check_modules(GLIB2 glib-2.0) ++ list(APPEND GFAL_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS}) ++endif() ++ # handle the QUIETLY and REQUIRED arguments and set GFAL_FOUND to TRUE if # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) +-INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARIES) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GFAL DEFAULT_MSG GFAL_LIBRARIES GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GLIB2_INCLUDE_DIRS) ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(GFAL DEFAULT_MSG GFAL_INCLUDE_DIR SRM_IFCE_INCLUDE_DIR GFAL_LIBRARY) - mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR) +-mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR) ++mark_as_advanced(GFAL_FOUND GFAL_INCLUDE_DIR GFAL_LIBRARIES SRM_IFCE_INCLUDE_DIR GLIB_INCLUDE_DIR) diff -Nur root-6.06.02.orig/cmake/modules/FindGlobus.cmake root-6.06.02/cmake/modules/FindGlobus.cmake --- root-6.06.02.orig/cmake/modules/FindGlobus.cmake 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/cmake/modules/FindGlobus.cmake 2016-03-20 17:08:52.183461633 +0100 diff --git a/root-cache-test.patch b/root-cache-test.patch index ca24479..1cf437e 100644 --- a/root-cache-test.patch +++ b/root-cache-test.patch @@ -41,16 +41,19 @@ diff -ur root-6.06.02.orig/test/stressHistogram.cxx root-6.06.02/test/stressHist diff -ur root-6.06.02.orig/test/stressRooFit.cxx root-6.06.02/test/stressRooFit.cxx --- root-6.06.02.orig/test/stressRooFit.cxx 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/test/stressRooFit.cxx 2016-03-30 05:39:17.330313983 +0200 -@@ -78,7 +78,8 @@ +@@ -78,9 +78,10 @@ cout << "stressRooFit ERROR: reference file must be local file in writing mode" << endl ; return 1; } - fref = new TWebFile(refFile) ; + TFile::SetCacheFileDir("."); -+ fref = new TFile(refFile,"CACHEREAD") ; ++ fref = TFile::Open(refFile,"CACHEREAD") ; } else { - fref = new TFile(refFile,writeRef?"RECREATE":"") ; +- fref = new TFile(refFile,writeRef?"RECREATE":"") ; ++ fref = TFile::Open(refFile,writeRef?"RECREATE":"") ; } + if (fref->IsZombie()) { + cout << "stressRooFit ERROR: cannot open reference file " << refFile << endl ; diff -ur root-6.06.02.orig/test/stressTMVA.cxx root-6.06.02/test/stressTMVA.cxx --- root-6.06.02.orig/test/stressTMVA.cxx 2016-03-03 10:36:03.000000000 +0100 +++ root-6.06.02/test/stressTMVA.cxx 2016-03-30 06:11:11.630058265 +0200 diff --git a/root-gfal2.patch b/root-gfal2.patch index cdf06ac..a6f765a 100644 --- a/root-gfal2.patch +++ b/root-gfal2.patch @@ -6,7 +6,7 @@ diff -ur root-5.34.32.orig/io/gfal/src/TGFALFile.cxx root-5.34.32/io/gfal/src/TG // GFAL2 doesn't use special names for 64 bit versions -#ifdef _GFAL2_API_ -+#if defined(_GFAL2_API_) || defined(GFAL2_API_H_) ++#if defined(_GFAL2_API_) || defined(GFAL2_API_) || defined(_GFAL2_API) || defined(_GFAL2_API_H_) || defined(GFAL2_API_H_) || defined(_GFAL2_API_H) #define gfal_lseek64 gfal_lseek #define gfal_open64 gfal_open #define gfal_readdir64 gfal_readdir diff --git a/root-keysymbols.patch b/root-keysymbols.patch new file mode 100644 index 0000000..e8ee549 --- /dev/null +++ b/root-keysymbols.patch @@ -0,0 +1,16 @@ +diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt +index b80f366..35e0f70 100644 +--- a/core/base/CMakeLists.txt ++++ b/core/base/CMakeLists.txt +@@ -2,7 +2,10 @@ + # CMakeLists.txt file for building ROOT core/base package + ############################################################################ + +-ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h) ++ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/inc/GuiTypes.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/inc/KeySymbols.h ++ ${CMAKE_CURRENT_SOURCE_DIR}/inc/Buttons.h) + + if(root7) + set(root7src v7/src/*.cxx) diff --git a/root.spec b/root.spec index 0133bcf..4110b46 100644 --- a/root.spec +++ b/root.spec @@ -7,7 +7,7 @@ %global pythia8 1 %global xrootd 1 -%if %{?fedora}%{!?fedora:0} >= 20 && %{?fedora}%{!?fedora:0} <= 23 +%if %{?fedora}%{!?fedora:0} >= 20 # libhdfs is currently only available on intel architectures in Fedora %ifarch %{ix86} x86_64 %global hadoop 1 @@ -26,7 +26,7 @@ Name: root Version: 6.06.04 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -144,6 +144,9 @@ Patch41: %{name}-no-testdata.patch # Avoid using std::bind with lambdas (fixed upstream) Patch42: %{name}-avoid-std-bind-lambda.patch +# Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport) +Patch43: %{name}-keysymbols.patch + # s390 is not supported by cling: "error: unknown target # triple 's390-ibm-linux', please use -triple or -arch" ExcludeArch: s390 @@ -1586,6 +1589,7 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html %patch40 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 chmod 644 math/mathcore/src/mixmax.h math/mathcore/src/mixmax.cxx @@ -3019,6 +3023,11 @@ fi %{python_sitelib}/ROOTaaS %changelog +* Sun Jun 19 2016 Mattias Ellert - 6.06.04-4 +- Add GuiTypes.h, KeySymbols.h and Buttons.h to dict (backport) +- Minor updates to patches - mostly backported from upstream +- Reenable hadoop/hdfs support for F24+ + * Mon Jun 13 2016 Mattias Ellert - 6.06.04-3 - Remove mathtext and minicern references from cmake files - Fix the spelling of CMAKE_Fortran_FLAGS in a few places