From a95a6d6f131e55c9b20b3ce85fba04e89279ea53 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Jun 13 2016 19:19:41 +0000
Subject: Remove mathtext and minicern references from cmake files


- Fix the spelling of CMAKE_Fortran_FLAGS in a few places

---

diff --git a/root-latex-markup.patch b/root-latex-markup.patch
index 1edd1d4..48e2a28 100644
--- a/root-latex-markup.patch
+++ b/root-latex-markup.patch
@@ -19,7 +19,7 @@ diff -ur root-6.06.02.orig/graf2d/graf/src/TLatex.cxx root-6.06.02/graf2d/graf/s
 +   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
 +   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
 +   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
-+   Tl.DrawText(.1, .6, "#acure{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
++   Tl.DrawText(.1, .6, "#acute{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
 +   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
 +   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
 +   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
diff --git a/root-more-fflags.patch b/root-more-fflags.patch
new file mode 100644
index 0000000..5332043
--- /dev/null
+++ b/root-more-fflags.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index f51bcbe..1ee0602 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
+ #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
+ string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
+-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
++string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
+ set(ROOT_COMPILER_FLAG_HINTS "#
+ set(ROOT_CXX_FLAGS \"${__cxxflags}\")
+ set(ROOT_C_FLAGS \"${__cflags}\")
+diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
+index 045926d..a419744 100644
+--- a/cmake/scripts/RootUseFile.cmake.in
++++ b/cmake/scripts/RootUseFile.cmake.in
+@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
+diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
+index b9a8e34..f931ad3 100644
+--- a/etc/cmake/RootUseFile.cmake
++++ b/etc/cmake/RootUseFile.cmake
+@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
+ add_definitions(${ROOT_DEFINITIONS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
+-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
++set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
diff --git a/root.spec b/root.spec
index 9f1d18f..0133bcf 100644
--- a/root.spec
+++ b/root.spec
@@ -26,7 +26,7 @@
 Name:		root
 Version:	6.06.04
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPLv2+
@@ -78,6 +78,8 @@ Patch13:	%{name}-fflags.patch
 Patch14:	%{name}-unuran.patch
 #		Use systme gl2ps
 Patch15:	%{name}-gl2ps.patch
+#		More CMAKE_Fortran_FLAGS case issues
+Patch16:	%{name}-more-fflags.patch
 #		Use the same soname for cmake and configure
 Patch17:	%{name}-soname.patch
 #		Save memory during build
@@ -1557,6 +1559,7 @@ sed 's! *$!!' -i math/smatrix/doc/SVector.html
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
@@ -1913,6 +1916,14 @@ rm %{buildroot}%{_pkgdocdir}/INSTALL
 rm %{buildroot}%{_pkgdocdir}/README.ALIEN
 rm %{buildroot}%{_pkgdocdir}/README.MONALISA
 
+# Remove mathtext and minicern references from cmake files
+sed -e 's/ mathtext / /' -e /mathtext/d \
+    -e 's/ minicern / /' -e /minicern/d \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets.cmake
+sed -e '/Import target "mathtext"/,/FILES_FOR_mathtext/d' -e 's/;mathtext//' \
+    -e '/Import target "minicern"/,/FILES_FOR_minicern/d' -e 's/;minicern//' \
+    -i %{buildroot}%{_datadir}/%{name}/cmake/ROOTConfig-targets-*.cmake
+
 # Only used on Windows
 rm %{buildroot}%{_datadir}/%{name}/macros/fileopen.C
 
@@ -3008,6 +3019,10 @@ fi
 %{python_sitelib}/ROOTaaS
 
 %changelog
+* Mon Jun 13 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-3
+- Remove mathtext and minicern references from cmake files
+- Fix the spelling of CMAKE_Fortran_FLAGS in a few places
+
 * Sat Jun 04 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 6.06.04-2
 - Disable hadoop/hdfs support for F24+ (hadoop was retired)