From 3dbbb6f535941785e000aac83fac296b640a5aa3 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sep 29 2017 03:39:45 +0000 Subject: Update to 6.10.06 Fixes for new mysql_config --- diff --git a/root-mysql-config.patch b/root-mysql-config.patch new file mode 100644 index 0000000..58db421 --- /dev/null +++ b/root-mysql-config.patch @@ -0,0 +1,50 @@ +From 6991169440211dd29c4608541b8740337c1891fa Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Wed, 27 Sep 2017 21:06:41 +0200 +Subject: [PATCH] Fix for new mysql_config + +--- + cmake/modules/FindMySQL.cmake | 9 +++------ + configure | 4 +++- + 2 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake +index 123505a393..c818f5a1ab 100644 +--- a/cmake/modules/FindMySQL.cmake ++++ b/cmake/modules/FindMySQL.cmake +@@ -20,12 +20,9 @@ endif() + if(MYSQL_CONFIG_EXECUTABLE) + execute_process(COMMAND ${MYSQL_CONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE MYSQL_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) + separate_arguments(MYSQL_CFLAGS) +- string( REGEX MATCH "-I[^;]+" MYSQL_INCLUDE_DIR "${MYSQL_CFLAGS}" ) +- string( REPLACE "-I" "" MYSQL_INCLUDE_DIR "${MYSQL_INCLUDE_DIR}") +- if(NOT EXISTS ${MYSQL_INCLUDE_DIR}) +- set(MYSQL_INCLUDE_DIR MYSQL_INCLUDE_DIR-NOTFOUND) +- endif() +- string( REGEX REPLACE "-I[^;]+;" "" MYSQL_CFLAGS "${MYSQL_CFLAGS}" ) ++ string( REGEX MATCHALL "-I[^;]+" MYSQL_INCLUDE_DIRS "${MYSQL_CFLAGS}" ) ++ string( REPLACE "-I" "" MYSQL_INCLUDE_DIRS "${MYSQL_INCLUDE_DIRS}") ++ find_path(MYSQL_INCLUDE_DIR mysql.h PATHS ${MYSQL_INCLUDE_DIRS} NO_DEFAULT_PATH) + execute_process(COMMAND ${MYSQL_CONFIG_EXECUTABLE} --libs OUTPUT_VARIABLE MYSQL_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) + else() + find_path(MYSQL_INCLUDE_DIR mysql.h +diff --git a/configure b/configure +index 26fe09ab31..6bdf5b29c4 100755 +--- a/configure ++++ b/configure +@@ -3738,9 +3738,11 @@ if test ! "x$enable_mysql" = "xno"; then + else + result "ok" + mysqllib=`$mysql_config --libs | sed -e s/\'//g` +- mysqlincdir=`$mysql_config --cflags | sed -e 's,^.*-I\([^ ]*\).*$,\1,' -e s/\'//g` + mysqllibdir="" ++ mysqlincdir=`$mysql_config --cflags | sed -e s/\'//g | tr ' ' '\n' | grep ^-I | sed -e 's,^-I,,' | tr '\n' ' '` + check_header "mysql.h" "" $mysqlincdir ++ mysqlinc=$found_hdr ++ mysqlincdir=$found_dir + if test "x$found_hdr" = "x"; then + enable_mysql="no" + fi +-- +2.13.5 + diff --git a/root-mysql-workaround.patch b/root-mysql-workaround.patch index be2ad62..ad7773d 100644 --- a/root-mysql-workaround.patch +++ b/root-mysql-workaround.patch @@ -1,21 +1,28 @@ -diff -ur root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx root-6.10.04/sql/mysql/src/TMySQLServer.cxx ---- root-6.10.04.orig/sql/mysql/src/TMySQLServer.cxx 2017-07-28 15:15:40.000000000 +0200 -+++ root-6.10.04/sql/mysql/src/TMySQLServer.cxx 2017-08-07 07:48:59.759498319 +0200 -@@ -41,6 +41,8 @@ - // // - ////////////////////////////////////////////////////////////////////////// - -+#include -+ - #include "TMySQLServer.h" - #include "TMySQLResult.h" - #include "TMySQLStatement.h" -@@ -52,8 +54,6 @@ +From 511ae175e21c6b5fa32201de23b379f80ed37981 Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio +Date: Tue, 5 Sep 2017 14:57:40 +0200 +Subject: [PATCH] Do not include internal MySQL header + +This breaks the build with -Dmysql=ON since the internal header will +not be found. +--- + sql/mysql/src/TMySQLServer.cxx | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/sql/mysql/src/TMySQLServer.cxx b/sql/mysql/src/TMySQLServer.cxx +index ee9d912e0f..40eebf55e9 100644 +--- a/sql/mysql/src/TMySQLServer.cxx ++++ b/sql/mysql/src/TMySQLServer.cxx +@@ -52,9 +52,6 @@ #include "TObjString.h" #include "TObjArray.h" -#include - - +- ClassImp(TMySQLServer) + //////////////////////////////////////////////////////////////////////////////// +-- +2.13.5 + diff --git a/root.spec b/root.spec index 105dab4..2ed797d 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.04 +Version: 6.10.06 %global libversion %(cut -d. -f 1-2 <<< %{version}) Release: 1%{?dist} Summary: Numerical data analysis framework @@ -59,9 +59,12 @@ Patch5: %{name}-stressgraphics.patch # Avoid build failures due to temporary file name clashes # Backported from upstream git (master) Patch6: %{name}-rootcling-tmpfile.patch -# Temporary workaround for broken mariadb headers in Fedora 27 -# https://bugzilla.redhat.com/show_bug.cgi?id=1478739 +# Do not include internal MySQL header +# Backported from upstream git (master) Patch7: %{name}-mysql-workaround.patch +# Adapt to new mysql_config version +# https://github.com/root-project/root/pull/1067 +Patch8: %{name}-mysql-config.patch # s390 is not supported by cling: "error: unknown target # triple 's390-ibm-linux', please use -triple or -arch" @@ -104,7 +107,11 @@ BuildRequires: unuran-devel BuildRequires: krb5-devel BuildRequires: krb5-workstation BuildRequires: openldap-devel +%if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8 +BuildRequires: mariadb-connector-c-devel +%else BuildRequires: mysql-devel +%endif BuildRequires: sqlite-devel BuildRequires: unixODBC-devel BuildRequires: mesa-libGL-devel @@ -175,7 +182,7 @@ BuildRequires: redhat-lsb-core BuildRequires: font(freesans) BuildRequires: font(freeserif) BuildRequires: font(freemono) -# Provides "symbol" and "dingbats" +# Provides "symbol", "dingbats" and "chancery" BuildRequires: urw-fonts # The root-fonts package provides Droid Sans Fallback for EPEL %if %{?fedora}%{!?fedora:0} >= 11 @@ -289,12 +296,13 @@ Requires: %{name}-matrix%{?_isa} = %{version}-%{release} Requires: %{name}-multiproc%{?_isa} = %{version}-%{release} Requires: %{name}-physics%{?_isa} = %{version}-%{release} Requires: %{name}-tree%{?_isa} = %{version}-%{release} +Requires: %{name}-tree-player%{?_isa} = %{version}-%{release} # Fonts Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: font(freesans) Requires: font(freeserif) Requires: font(freemono) -# Provides "symbol" and "dingbats" +# Provides "symbol", "dingbats" and "chancery" Requires: urw-fonts # The root-fonts package provides Droid Sans Fallback for EPEL %if %{?fedora}%{!?fedora:0} >= 11 @@ -1565,9 +1573,8 @@ ROOT as a Jupyter Notebook. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%if %{?fedora}%{!?fedora:0} >= 27 %patch7 -p1 -%endif +%patch8 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -3145,6 +3152,10 @@ fi %{_datadir}/%{name}/notebook %changelog +* Wed Sep 27 2017 Mattias Ellert - 6.10.06-1 +- Update to 6.10.06 +- Fixes for new mysql_config + * Sat Aug 05 2017 Mattias Ellert - 6.10.04-1 - Update to 6.10.04 - Add temporary workaround for broken mariadb headers in Fedora 27 diff --git a/sources b/sources index fdc2b72..dfae873 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (root-6.10.04.tar.xz) = 37f5462b22d0ce8aefaa7de375715f5ae1bf64b8b7bdb2110b1bb8f3b99744354014b1cb7bbf926cd046dd695f6c364504ea6512857da086dd963d449cbba5da +SHA512 (root-6.10.06.tar.xz) = 4e35c1e014c5346e4457dc71766cce8f6f57dd77ec94f62597f82d6baedaf68bfb5ee1d80b0bc8aab22dc09de1f0a7013a4ce81eaf608aeca06a8b8cf8f22ea3 SHA512 (root-testfiles.tar.xz) = 1a1295693b80aa27546bd9cf4a34cb38df1a3be2b14a3a29f418cd49058ae5d581e03e2e7fb9e978d448b29cf407e0f0bb4a5c26211e519d506166ec0b78e86b