From 055702ad137cef3ba0193dfa17e666cc0eedcbde Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Oct 20 2017 17:32:45 +0000 Subject: Update to 6.10.08 Add BuildRequires on lz4-devel and xxhash-devel Workaround for missing gmock libraries only needed for gmock < 0.1.8 Address some warnings during documentation generation --- diff --git a/root-dox-filter.patch b/root-dox-filter.patch new file mode 100644 index 0000000..0cb43bc --- /dev/null +++ b/root-dox-filter.patch @@ -0,0 +1,86 @@ +From 44ca9d32d47782597e58e75575fdffba135ab8e7 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Wed, 18 Oct 2017 13:34:34 +0200 +Subject: [PATCH] Fix \cond without \endcond warnings + +--- + documentation/doxygen/filter.cxx | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx +index 85309dd6f7..de8acb4bc9 100644 +--- a/documentation/doxygen/filter.cxx ++++ b/documentation/doxygen/filter.cxx +@@ -107,7 +107,6 @@ bool gImageSource; // True the source of the current macro should be shown + int gInMacro; // >0 if parsing a macro in a class documentation. + int gImageID; // Image Identifier. + int gMacroID; // Macro identifier in class documentation. +-int gShowTutSource; // >0 if the tutorial source code should be shown + + + //////////////////////////////////////////////////////////////////////////////// +@@ -126,7 +125,6 @@ int main(int argc, char *argv[]) + gMacroID = 0; + gOutputName = "stdout.dat"; + gImageType = "png"; +- gShowTutSource = 0; + if (EndsWith(gFileName,".cxx")) gSource = true; + if (EndsWith(gFileName,".h")) gHeader = true; + if (EndsWith(gFileName,".py")) gPython = true; +@@ -273,6 +271,9 @@ void FilterTutorial() + // File for inline macros. + FILE *m = 0; + ++ int showTutSource = 0; ++ int incond = 0; ++ + // Extract the macro name + int i1 = gFileName.rfind('/')+1; + int i2 = gFileName.rfind('C'); +@@ -311,7 +312,7 @@ void FilterTutorial() + + // \macro_code found + if (gLineString.find("\\macro_code") != string::npos) { +- gShowTutSource = 1; ++ showTutSource = 1; + m = fopen(StringFormat("%s/macros/%s",gOutDir.c_str(),gMacroName.c_str()).c_str(), "w"); + ReplaceAll(gLineString, "\\macro_code", StringFormat("\\include %s",gMacroName.c_str())); + } +@@ -339,19 +340,23 @@ void FilterTutorial() + } + + // \author is the last comment line. +- if (gLineString.find("\\author") != string::npos) { ++ if (gLineString.find("\\author") != string::npos) { + if (gPython) printf("%s",StringFormat("%s \n## \\cond \n",gLineString.c_str()).c_str()); + else printf("%s",StringFormat("%s \n/// \\cond \n",gLineString.c_str()).c_str()); +- if (gShowTutSource == 1) gShowTutSource = 2; ++ if (showTutSource == 1) showTutSource = 2; ++ incond = 1; + } else { + printf("%s",gLineString.c_str()); +- if (m && gShowTutSource == 2) fprintf(m,"%s",gLineString.c_str()); ++ if (m && showTutSource == 2) fprintf(m,"%s",gLineString.c_str()); + } + } + +- if (m) { ++ if (incond) { + if (gPython) printf("## \\endcond \n"); + else printf("/// \\endcond \n"); ++ } ++ ++ if (m) { + fclose(m); + } + } +@@ -511,4 +516,4 @@ bool EndsWith(string const &fullString, string const &ending) { + + bool BeginsWith(const string& haystack, const string& needle) { + return needle.length() <= haystack.length() && equal(needle.begin(), needle.end(), haystack.begin()); +-} +\ No newline at end of file ++} +-- +2.13.6 + diff --git a/root-unbundle-gtest.patch b/root-unbundle-gtest.patch index 29cf011..c40ce0a 100644 --- a/root-unbundle-gtest.patch +++ b/root-unbundle-gtest.patch @@ -1,7 +1,7 @@ -diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.00/cmake/modules/SearchInstalledSoftware.cmake ---- root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake 2017-06-13 09:14:04.000000000 +0200 -+++ root-6.10.00/cmake/modules/SearchInstalledSoftware.cmake 2017-06-15 14:21:08.367446162 +0200 -@@ -1471,73 +1471,15 @@ +diff -ur root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake +--- root-6.10.08.orig/cmake/modules/SearchInstalledSoftware.cmake 2017-10-16 18:28:58.000000000 +0200 ++++ root-6.10.08/cmake/modules/SearchInstalledSoftware.cmake 2017-10-19 21:18:23.053801458 +0200 +@@ -1511,74 +1511,19 @@ #---Download googletest-------------------------------------------------------------- if (testing) @@ -62,6 +62,8 @@ diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10 - add_library(gtest_main IMPORTED STATIC GLOBAL) - set_property(TARGET gtest_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/gtest/libgtest_main.a) - add_dependencies(gtest_main googletest) ++ # Workaround for missing libraries in Fedora's gmock packaging < 1.8.0 ++ if(EXISTS ${CMAKE_SOURCE_DIR}/googlemock) + set(_G_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/googlemock) # gmock @@ -74,5 +76,7 @@ diff -ur root-6.10.00.orig/cmake/modules/SearchInstalledSoftware.cmake root-6.10 set_property(TARGET gmock_main PROPERTY IMPORTED_LOCATION ${_G_LIBRARY_PATH}/libgmock_main.a) - add_dependencies(gmock_main googletest) ++ endif() endif() + #---Report non implemented options--------------------------------------------------- diff --git a/root.spec b/root.spec index 2ed797d..3bb58da 100644 --- a/root.spec +++ b/root.spec @@ -23,7 +23,7 @@ %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/libJupyROOT\\.so$ Name: root -Version: 6.10.06 +Version: 6.10.08 %global libversion %(cut -d. -f 1-2 <<< %{version}) Release: 1%{?dist} Summary: Numerical data analysis framework @@ -65,6 +65,9 @@ Patch7: %{name}-mysql-workaround.patch # Adapt to new mysql_config version # https://github.com/root-project/root/pull/1067 Patch8: %{name}-mysql-config.patch +# Address some warnings during documentation generation +# https://github.com/root-project/root/pull/1212 +Patch9: %{name}-dox-filter.patch # s390 is not supported by cling: "error: unknown target # triple 's390-ibm-linux', please use -triple or -arch" @@ -96,6 +99,8 @@ BuildRequires: gl2ps-devel BuildRequires: pcre-devel BuildRequires: zlib-devel BuildRequires: xz-devel +BuildRequires: lz4-devel +BuildRequires: xxhash-devel BuildRequires: libAfterImage-devel >= 1.20 BuildRequires: ncurses-devel BuildRequires: avahi-compat-libdns_sd-devel @@ -1575,6 +1580,7 @@ ROOT as a Jupyter Notebook. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -1621,7 +1627,8 @@ sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/* # Build PyROOT for python 3 cp -pr bindings/pyroot bindings/python -# Work around missing libraries in Fedora's gmock packaging +# Work around missing libraries in Fedora's gmock packaging < 1.8.0 +if [ ! -r %{_libdir}/libgmock.so ] ; then mkdir googlemock pushd googlemock g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock-all.o /usr/src/gmock/gmock-all.cc @@ -1629,6 +1636,7 @@ ar rv libgmock.a gmock-all.o g++ %{optflags} -DGTEST_HAS_PTHREAD=1 -c -o gmock_main.o /usr/src/gmock/gmock_main.cc ar rv libgmock_main.a gmock_main.o popd +fi %build unset QTDIR @@ -1667,6 +1675,7 @@ LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" -Dbuiltin_glew:BOOL=OFF \ -Dbuiltin_gsl:BOOL=OFF \ -Dbuiltin_llvm:BOOL=ON \ + -Dbuiltin_lz4:BOOL=OFF \ -Dbuiltin_lzma:BOOL=OFF \ -Dbuiltin_openssl:BOOL=OFF \ -Dbuiltin_pcre:BOOL=OFF \ @@ -3152,6 +3161,12 @@ fi %{_datadir}/%{name}/notebook %changelog +* Fri Oct 20 2017 Mattias Ellert - 6.10.08-1 +- Update to 6.10.08 +- Add BuildRequires on lz4-devel and xxhash-devel +- Workaround for missing gmock libraries only needed for gmock < 0.1.8 +- Address some warnings during documentation generation + * Wed Sep 27 2017 Mattias Ellert - 6.10.06-1 - Update to 6.10.06 - Fixes for new mysql_config