[root/el5: 32/32] Update to 5.34.09
Mattias Ellert
ellert at fedoraproject.org
Fri Jun 28 06:28:47 UTC 2013
commit 4bec959a0d4fec25aaf563622ec0501abf388e22
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Fri Jun 28 08:21:44 2013 +0200
Update to 5.34.09
- New sub-package: root-montecarlo-pythia8
- Drop patch root-gfal-bits.patch
- Use xz compression for source tarfile
- Update ancient root version in EPEL
.gitignore | 1 +
root-doc-latex.patch | 66 +++++++++++++++++++++++++++++++++++++++++
root-gfal-bits.patch | 9 ------
root.spec | 79 ++++++++++++++++++++++++++++++++++++++++++++------
sources | 2 +-
5 files changed, 138 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6a3a77..5c35620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/*.tar.gz
+/*.tar.xz
diff --git a/root-doc-latex.patch b/root-doc-latex.patch
new file mode 100644
index 0000000..c3150a0
--- /dev/null
+++ b/root-doc-latex.patch
@@ -0,0 +1,66 @@
+diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/src/TEfficiency.cxx
+--- root-5.34.09.orig/hist/hist/src/TEfficiency.cxx 2013-06-26 17:05:06.000000000 +0200
++++ root-5.34.09/hist/hist/src/TEfficiency.cxx 2013-06-27 07:06:03.769693346 +0200
+@@ -2498,7 +2498,7 @@
+ //the same process.
+ //
+ //The new weight is set according to:
+- //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex
++ //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex
+
+ if(!pList->IsEmpty()) {
+ TIter next(pList);
+@@ -2558,7 +2558,7 @@
+ //calculates a new weight:
+ //current weight of this TEfficiency object = Begin_Latex w_{1} End_Latex
+ //weight of rhs = Begin_Latex w_{2} End_Latex
+- //Begin_Latex w_{new} = \frac{w_{1} \times w_{2}}{w_{1} + w_{2}}End_Latex
++ //Begin_Latex w_{new} = #frac{w_{1} #times w_{2}}{w_{1} + w_{2}}End_Latex
+
+
+ if (fTotalHistogram == 0 && fPassedHistogram == 0) {
+@@ -2971,11 +2971,11 @@
+ //______________________________________________________________________________
+ void TEfficiency::SetBetaAlpha(Double_t alpha)
+ {
+- //sets the shape parameter Begin_Latex \alpha End_Latex
++ //sets the shape parameter Begin_Latex #alpha End_Latex
+ //
+ //The prior probability of the efficiency is given by the beta distribution:
+ //Begin_Latex
+- // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
++ // f(#varepsilon;#alpha;#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
+ //End_Latex
+ //
+ //Note: - both shape parameters have to be positive (i.e. > 0)
+@@ -2989,11 +2989,11 @@
+ //______________________________________________________________________________
+ void TEfficiency::SetBetaBeta(Double_t beta)
+ {
+- //sets the shape parameter Begin_Latex \beta End_Latex
++ //sets the shape parameter Begin_Latex #beta End_Latex
+ //
+ //The prior probability of the efficiency is given by the beta distribution:
+ //Begin_Latex
+- // f(\varepsilon;\alpha,\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
++ // f(#varepsilon;#alpha,#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
+ //End_Latex
+ //
+ //Note: - both shape parameters have to be positive (i.e. > 0)
+@@ -3007,12 +3007,12 @@
+ //______________________________________________________________________________
+ void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta)
+ {
+- //sets different shape parameter Begin_Latex \alpha and \beta End_Latex
+- // for the prior distribution for each bin. By default the global parameter are used if they are not set
+- // for the specific bin
++ //sets different shape parameter Begin_Latex #alpha and #beta End_Latex
++ //for the prior distribution for each bin. By default the global parameter are used if they are not set
++ //for the specific bin
+ //The prior probability of the efficiency is given by the beta distribution:
+ //Begin_Latex
+- // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1}
++ // f(#varepsilon;#alpha;#beta) = #frac{1}{B(#alpha,#beta)} #varepsilon^{#alpha-1} (1 - #varepsilon)^{#beta-1}
+ //End_Latex
+ //
+ //Note: - both shape parameters have to be positive (i.e. > 0)
diff --git a/root.spec b/root.spec
index cb3d355..525b975 100644
--- a/root.spec
+++ b/root.spec
@@ -40,7 +40,7 @@
%endif
Name: root
-Version: 5.34.07
+Version: 5.34.09
%global libversion %(cut -d. -f 1-2 <<< %{version})
Release: 1%{?dist}
Summary: Numerical data analysis framework
@@ -53,8 +53,8 @@ URL: http://root.cern.ch/
# tar -z -x -f root_v%{version}.source.tar.gz
# rm -rf root/fonts
# mv root root-%{version}
-# tar -z -c -f root-%{version}.tar.gz root-%{version}
-Source0: %{name}-%{version}.tar.gz
+# tar -J -c -f root-%{version}.tar.xz root-%{version}
+Source0: %{name}-%{version}.tar.xz
# Script to extract the list of include files in a subpackage
Source1: root-includelist
# Documentation generation script
@@ -74,8 +74,8 @@ Patch3: %{name}-xrootd.patch
# Fix hardcoded include path:
# https://savannah.cern.ch/bugs/index.php?91463
Patch4: %{name}-meta.patch
-# Missing include path:
-Patch5: %{name}-gfal-bits.patch
+# Use TLatex in doc generation:
+Patch5: %{name}-doc-latex.patch
# Revert THtml change:
Patch6: %{name}-thtml-revert.patch
# Don't save in all image formats:
@@ -151,6 +151,9 @@ BuildRequires: graphviz-devel
BuildRequires: graphviz-gd
%endif
BuildRequires: expat-devel
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+BuildRequires: pythia8-devel
+%endif
%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: font(liberationsans)
BuildRequires: font(liberationserif)
@@ -158,8 +161,20 @@ BuildRequires: font(liberationmono)
%else
BuildRequires: liberation-fonts
%endif
-# This contains a Symbol font that can be used by fontconfig
+%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
+%ifarch %{ix86} x86_64
+BuildRequires: font(symbol)
+%else
+BuildRequires: urw-fonts
+%endif
+%else
BuildRequires: urw-fonts
+%endif
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+%ifarch %{ix86} x86_64
+BuildRequires: font(wingdings)
+%endif
+%endif
%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: font(droidsansfallback)
%endif
@@ -253,8 +268,20 @@ Requires: font(liberationmono)
%else
Requires: liberation-fonts
%endif
-# This contains a Symbol font that can be used by fontconfig
+%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
+%ifarch %{ix86} x86_64
+Requires: font(symbol)
+%else
+Requires: urw-fonts
+%endif
+%else
Requires: urw-fonts
+%endif
+%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
+%ifarch %{ix86} x86_64
+Requires: font(wingdings)
+%endif
+%endif
%if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6
Requires: font(droidsansfallback)
%endif
@@ -836,6 +863,18 @@ Group: Applications/Engineering
%description montecarlo-eg
This package contains an event generator library for ROOT.
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+%package montecarlo-pythia8
+Summary: Pythia version 8 plugin for ROOT
+Group: Applications/Engineering
+
+%description montecarlo-pythia8
+This package contains the Pythia version 8 plug-in for ROOT. This
+package provide the ROOT user with transparent interface to the Pythia
+(version 8) event generators for hadronic interactions. If the term
+"hadronic" does not ring any bells, this package is not for you.
+%endif
+
%package montecarlo-vmc
Summary: Virtual Monte-Carlo (simulation) library for ROOT
Group: Applications/Engineering
@@ -1207,6 +1246,12 @@ unset QTINC
--enable-opengl \
--enable-pgsql \
--enable-python \
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+ --enable-pythia8 \
+ --with-pythia8-incdir=%{_includedir}/pythia8 \
+%else
+ --disable-pythia8 \
+%endif
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
--enable-qt \
--enable-qtgsi \
@@ -1251,7 +1296,6 @@ unset QTINC
--disable-monalisa \
--disable-oracle \
--disable-pythia6 \
- --disable-pythia8 \
--disable-rpath \
--disable-sapdb \
--disable-srp \
@@ -1363,7 +1407,7 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/*.sample
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils
rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/root.desktop
rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/system.plugins-ios
-rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/svninfo.txt
+rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gitinfo.txt
%if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libAfterImage.a
%endif
@@ -1685,6 +1729,10 @@ fi
%postun table -p /sbin/ldconfig
%post montecarlo-eg -p /sbin/ldconfig
%postun montecarlo-eg -p /sbin/ldconfig
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+%post montecarlo-pythia8 -p /sbin/ldconfig
+%postun montecarlo-pythia8 -p /sbin/ldconfig
+%endif
%post montecarlo-vmc -p /sbin/ldconfig
%postun montecarlo-vmc -p /sbin/ldconfig
%post net -p /sbin/ldconfig
@@ -2198,6 +2246,12 @@ fi
%{_datadir}/%{name}/pdg_table.txt
%doc %{_defaultdocdir}/%{name}-%{version}/cfortran.doc
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 5
+%files montecarlo-pythia8 -f includelist-montecarlo-pythia8
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libEGPythia8.*
+%endif
+
%files montecarlo-vmc -f includelist-montecarlo-vmc
%defattr(-,root,root,-)
%{_libdir}/%{name}/libVMC.*
@@ -2350,6 +2404,13 @@ fi
%{emacs_lispdir}/root/*.el
%changelog
+* Fri Jun 28 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.09-1
+- Update to 5.34.09
+- New sub-package: root-montecarlo-pythia8
+- Drop patch root-gfal-bits.patch
+- Use xz compression for source tarfile
+- Update ancient root version in EPEL
+
* Sat Apr 27 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.34.07-1
- Update to 5.34.07
diff --git a/sources b/sources
index c5fddbd..1d7209e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6fda5e6b48dadf4eda1498cdfa3d8637 root-5.34.07.tar.gz
+63fd002819184001cd4293aaf04b0ab5 root-5.34.09.tar.xz
More information about the scm-commits
mailing list