[root] Add workaround for rootcint problem on i686 Pass default LDFLAGS (relro) to make

[Mattias Ellert]

commit d73bbeb218813539aee65d2b50eb0e8a451c2791
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jul 26 12:24:12 2011 +0200

    Add workaround for rootcint problem on i686
    Pass default LDFLAGS (relro) to make

 root-cint-i686.patch |   17 +++++++++++++++++
 root.spec            |   15 ++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/root-cint-i686.patch b/root-cint-i686.patch
new file mode 100644
index 0000000..2ae1274
--- /dev/null
+++ b/root-cint-i686.patch
@@ -0,0 +1,17 @@
+diff -ur root-5.30.00.orig/math/mathcore/inc/Fit/Chi2FCN.h root-5.30.00/math/mathcore/inc/Fit/Chi2FCN.h
+--- root-5.30.00.orig/math/mathcore/inc/Fit/Chi2FCN.h	2011-06-28 11:49:18.000000000 +0200
++++ root-5.30.00/math/mathcore/inc/Fit/Chi2FCN.h	2011-07-26 09:20:47.507000002 +0200
+@@ -55,11 +55,11 @@
+ 
+ template<class FunType> 
+ struct ModelFunctionTrait { 
+-   typedef  ::ROOT::Math::IParamMultiFunction ModelFunc;
++   typedef  ROOT::Math::IParamMultiFunction ModelFunc;
+ };
+ template<>      
+ struct ModelFunctionTrait<ROOT::Math::IMultiGradFunction>  { 
+-   typedef  ::ROOT::Math::IParamMultiGradFunction ModelFunc;
++   typedef  ROOT::Math::IParamMultiGradFunction ModelFunc;
+ };
+ 
+ 
diff --git a/root.spec b/root.spec
index c2aaeee..05dde1b 100644
--- a/root.spec
+++ b/root.spec
@@ -20,7 +20,7 @@
 Name:		root
 Version:	5.30.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -53,6 +53,8 @@ Patch3:		%{name}-cern-ppc.patch
 Patch4:		%{name}-xrootd.patch
 #		Fix LZMA header search order
 Patch5:		%{name}-lzma-searchorder.patch
+#		Work-around for a bug in cint that affects Fedora 16 i686
+Patch6:		%{name}-cint-i686.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc64 during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
@@ -1028,6 +1030,7 @@ package to use root with GNU Emacs.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
 	   -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -1200,13 +1203,15 @@ unset QTINC
 	    --disable-srp \
 	    --fail-on-missing
 
-make OPTFLAGS="%{optflags}" %{?_smp_mflags}
+make OPTFLAGS="%{optflags}" \
+	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags}
 
 %if "%{?rhel}" == "5"
 # Build PyROOT for python 2.6
 mkdir pyroot26
 cp bindings/pyroot26/ROOT.py pyroot26
-make OPTFLAGS="%{optflags}" %{?_smp_mflags} \
+make OPTFLAGS="%{optflags}" \
+	EXTRA_LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} \
 	MODULES="build cint/cint core/utils bindings/pyroot26" \
 	PYTHONINCDIR=/usr/include/python2.6 PYTHONLIB=-lpython2.6 \
 	PYROOTLIB=pyroot26/libPyROOT.so ROOTPY=pyroot26/ROOT.py
@@ -2284,6 +2289,10 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Tue Jul 26 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.30.00-2
+- Add workaround for rootcint problem on i686
+- Pass default LDFLAGS (relro) to make
+
 * Sun Jul 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.30.00-1
 - Update to 5.30.00
 - Drop patch root-listbox-height.patch