From bf6d31776184dbf79fbd79188b3e41f9d941ae43 Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Tue, 13 Aug 2019 21:09:41 +0200
Subject: [PATCH 1/2] Add mkFit as an external

---
 mkfit-toolfile.spec | 24 ++++++++++++++++++++++++
 mkfit.spec          | 20 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 mkfit-toolfile.spec
 create mode 100644 mkfit.spec

diff --git a/mkfit-toolfile.spec b/mkfit-toolfile.spec
new file mode 100644
index 00000000000..cb836d2cab8
--- /dev/null
+++ b/mkfit-toolfile.spec
@@ -0,0 +1,24 @@
+### RPM external mkfit-toolfile 2.0.0
+Requires: mkfit
+
+%prep
+
+%build
+
+%install
+
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/mkfit.xml
+<tool name="mkfit" version="@TOOL_VERSION@">
+  <lib name="MicCore"/>
+  <lib name="MkFit"/>
+  <client>
+    <environment name="MKFITBASE" default="@TOOL_ROOT@"/>
+    <environment name="INCLUDE" default="$MKFITBASE/include"/>
+    <environment name="LIBDIR" default="$MKFITBASE/lib"/>
+  </client>
+  <runtime name="MKFIT_BASE" value="$MKFITBASE"/>
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post
diff --git a/mkfit.spec b/mkfit.spec
new file mode 100644
index 00000000000..7b735c35c86
--- /dev/null
+++ b/mkfit.spec
@@ -0,0 +1,20 @@
+### RPM external mkfit 2.0.0
+%define tag V2.0.0-1+pr237
+%define branch devel
+%define github_user trackreco
+
+Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+Requires: tbb
+
+%prep
+%setup -q -n %{n}-%{realversion}
+
+%build
+TBB_PREFIX=$TBB_ROOT make
+
+%install
+mkdir %{i}/include %{i}/include/mkFit %{i}/Geoms
+cp -a *.h %{i}/include
+cp -a mkFit/*.h %{i}/include/mkFit
+cp -a Geoms/*.so %{i}/Geoms
+cp -ar lib %{i}/lib

From 848fba7f0252cb879dbbf17e6a7131b1e1af8263 Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Wed, 14 Aug 2019 16:48:47 +0200
Subject: [PATCH 2/2] Use -march=core2 to override default -mavx

---
 mkfit.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkfit.spec b/mkfit.spec
index 7b735c35c86..84a6e0b80e6 100644
--- a/mkfit.spec
+++ b/mkfit.spec
@@ -10,7 +10,7 @@ Requires: tbb
 %setup -q -n %{n}-%{realversion}
 
 %build
-TBB_PREFIX=$TBB_ROOT make
+make TBB_PREFIX=$TBB_ROOT VEC_GCC="-march=core2"
 
 %install
 mkdir %{i}/include %{i}/include/mkFit %{i}/Geoms