diff --git a/root-includelist b/root-includelist index 0eccf90..cd7842c 100644 --- a/root-includelist +++ b/root-includelist @@ -3,11 +3,9 @@ includelist: @list=includelist-`tr / - <<< $(MODULE)` ; \ rm -f $$list ; \ for h in $(filter-out %.cw %.pri, $(ALLHDRS)) ; do \ - if [ "$(MODULE)" = "cint/cint7" ] ; then \ - sed 's!^include!%{_includedir}/%{name}/cint7!' <<< $$h >> $$list ; \ - else \ - sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \ - fi ; \ + sed 's!^include!%{_includedir}/%{name}!' <<< $$h >> $$list ; \ + done ; \ + if [ -r $$list ] ; then \ sort -u $$list > $$list.unique ; \ mv $$list.unique $$list ; \ - done + fi diff --git a/root.spec b/root.spec index 383e195..572b0f0 100644 --- a/root.spec +++ b/root.spec @@ -18,7 +18,7 @@ %endif Name: root -Version: 5.28.00g +Version: 5.28.00h %global libversion %(cut -d. -f 1-2 <<< %{version}) Release: 1%{?dist} Summary: Numerical data analysis framework @@ -108,6 +108,7 @@ BuildRequires: openssl-devel BuildRequires: globus-gss-assist-devel BuildRequires: globus-gsi-credential-devel BuildRequires: globus-proxy-utils +BuildRequires: libtool-ltdl-devel BuildRequires: desktop-file-utils BuildRequires: dcap-devel BuildRequires: dpm-devel @@ -1012,9 +1013,9 @@ package to use root with GNU Emacs. %prep %setup -q -%if %(pkg-config --max-version 2.1.2 ftgl 2>/dev/null && echo 1 || echo 0) +if pkg-config --max-version 2.1.2 ftgl ; then %patch0 -p1 -%endif +fi %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -2270,6 +2271,9 @@ fi %{emacs_lispdir}/root/*.el %changelog +* Mon Feb 13 2012 Mattias Ellert - 5.28.00h-1 +- Update to 5.28.00h + * Wed Sep 14 2011 Mattias Ellert - 5.28.00g-1 - Update to 5.28.00g diff --git a/sources b/sources index e136fb6..4b3101a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3db0a2db880f8744e4a01234d3020909 root-5.28.00g.tar.gz +db8bd261e56ae5dfbce75c1a5ce5e809 root-5.28.00h.tar.gz