[root] Update to 5.30.00 Drop patch root-listbox-height.patch New sub-package: root-proof-bench
Mattias Ellert
ellert at fedoraproject.org
Sun Jul 24 22:33:16 UTC 2011
commit cd11127daa1275f9e398a5d5e9c51abd5ff36090
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Jul 25 00:32:39 2011 +0200
Update to 5.30.00
Drop patch root-listbox-height.patch
New sub-package: root-proof-bench
root-listbox-height.patch | 20 --------------------
root-lzma-searchorder.patch | 14 ++++++++++++++
root-xrootd.patch | 28 ++++++++++++++--------------
root.spec | 40 +++++++++++++++++++++++++++++++---------
sources | 2 +-
5 files changed, 60 insertions(+), 44 deletions(-)
---
diff --git a/root-lzma-searchorder.patch b/root-lzma-searchorder.patch
new file mode 100644
index 0000000..546b42b
--- /dev/null
+++ b/root-lzma-searchorder.patch
@@ -0,0 +1,14 @@
+--- trunk/configure 2011/06/27 13:20:12 39990
++++ trunk/configure 2011/07/04 15:43:14 40127
+@@ -2430,8 +2430,9 @@
+ check_header "lzma.h" "" \
+ $LZMA ${LZMA:+$LZMA/include} \
+ ${finkdir:+$finkdir/include} \
+- /usr/local/include /usr/include/lzma /usr/local/include/lzma \
+- /opt/lzma/include /usr/include
++ /usr/local/include /usr/include \
++ /usr/local/include/lzma /usr/include/lzma \
++ /opt/lzma/include
+ if test "x$found_dir" = "x" ; then
+ enable_builtin_lzma=yes
+ else
diff --git a/root-xrootd.patch b/root-xrootd.patch
index 7e02e05..6fd328d 100644
--- a/root-xrootd.patch
+++ b/root-xrootd.patch
@@ -1,7 +1,7 @@
-diff -ur root-5.28.00c.orig/configure root-5.28.00c/configure
---- root-5.28.00c.orig/configure 2011-04-15 17:34:20.000000000 +0200
-+++ root-5.28.00c/configure 2011-04-23 13:02:29.385052080 +0200
-@@ -4307,13 +4307,14 @@
+diff -ur root-5.30.00.orig/configure root-5.30.00/configure
+--- root-5.30.00.orig/configure 2011-06-28 11:49:53.000000000 +0200
++++ root-5.30.00/configure 2011-07-24 15:09:47.307270249 +0200
+@@ -4364,13 +4364,14 @@
if test "x$externalxrd" = "xyes"; then
buildxrd="no"
# Check if bonjour is available for code potentially using it ...
@@ -23,10 +23,10 @@ diff -ur root-5.28.00c.orig/configure root-5.28.00c/configure
fi
else
buildxrd="no"
-diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Module.mk
---- root-5.28.00c.orig/proof/proofd/Module.mk 2011-04-15 17:33:43.000000000 +0200
-+++ root-5.28.00c/proof/proofd/Module.mk 2011-04-23 13:51:01.294607207 +0200
-@@ -115,12 +115,10 @@
+diff -ur root-5.30.00.orig/proof/proofd/Module.mk root-5.30.00/proof/proofd/Module.mk
+--- root-5.30.00.orig/proof/proofd/Module.mk 2011-06-28 11:49:12.000000000 +0200
++++ root-5.30.00/proof/proofd/Module.mk 2011-07-24 15:12:09.402270264 +0200
+@@ -127,12 +127,10 @@
ifeq ($(HASXRD),yes)
XPDINCEXTRA := $(XROOTDDIRI:%=-I%)
XPDINCEXTRA += $(PROOFDDIRI:%=-I%)
@@ -43,7 +43,7 @@ diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Mo
# Starting from Jul 2010 XrdNet has been split in two libs: XrdNet and XrdNetUtil;
# both are needed
XRDNETUTIL :=
-@@ -130,8 +128,8 @@
+@@ -142,8 +140,8 @@
fi)
endif
ifeq ($(XRDNETUTIL),yes)
@@ -54,12 +54,12 @@ diff -ur root-5.28.00c.orig/proof/proofd/Module.mk root-5.28.00c/proof/proofd/Mo
endif
XPDLIBEXTRA += $(DNSSDLIB)
-@@ -166,7 +164,7 @@
+@@ -178,7 +176,7 @@
$(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(GLBPATCHO) \
$(RSAO) $(SNPRINTFO) $(CRYPTLIBS) $(AUTHLIBS) $(STRLCPYO) $(SYSLIBS)
--$(XPROOFDEXE): $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD)
-+$(XPROOFDEXE): $(XPDO) $(XRDPROOFXD)
- $(LD) $(LDFLAGS) -o $@ $(XPDO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
+-$(XPROOFDEXE): $(XPDO) $(XPROOFDEXELIBS) $(XRDPROOFXD) $(RPDCONNO)
++$(XPROOFDEXE): $(XPDO) $(XRDPROOFXD) $(RPDCONNO)
+ $(LD) $(LDFLAGS) -o $@ $(XPDO) $(RPDCONNO) $(XPROOFDEXELIBS) $(SYSLIBS) $(XPROOFDEXESYSLIBS)
- $(XPDLIB): $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD)
+ $(XPDLIB): $(XPDO) $(XPDH) $(ORDER_) $(MAINLIBS) $(XRDPROOFXD) $(RPDCONNO)
diff --git a/root.spec b/root.spec
index 5ccaa3a..c2aaeee 100644
--- a/root.spec
+++ b/root.spec
@@ -18,9 +18,9 @@
%endif
Name: root
-Version: 5.28.00e
+Version: 5.30.00
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
Group: Applications/Engineering
@@ -49,10 +49,10 @@ Patch1: %{name}-fontconfig.patch
Patch2: %{name}-unuran.patch
# Workaround for broken Form() on ppc
Patch3: %{name}-cern-ppc.patch
-# Fix an issue with the TGListBox height (backported from trunk)
-Patch4: %{name}-listbox-height.patch
# Fixes for external xrootd
-Patch5: %{name}-xrootd.patch
+Patch4: %{name}-xrootd.patch
+# Fix LZMA header search order
+Patch5: %{name}-lzma-searchorder.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
@@ -69,6 +69,7 @@ BuildRequires: glew-devel
BuildRequires: gl2ps-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
+BuildRequires: xz-devel
%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: libAfterImage-devel >= 1.20
%else
@@ -839,6 +840,13 @@ Group: Applications/Engineering
This package contains the proof extension for ROOT. This provides a
client to use in a PROOF environment.
+%package proof-bench
+Summary: PROOF benchmarking
+Group: Applications/Engineering
+
+%description proof-bench
+This package contains the steering class for PROOF benchmarks.
+
%package proof-pq2
Summary: PROOF Quick Query (pq2)
Group: Applications/Engineering
@@ -1060,11 +1068,13 @@ rm -rf graf3d/glew/src graf3d/glew/inc
rm -rf core/pcre/src
# * zlib
rm -rf core/zip/src/[a-z]* core/zip/inc/[a-z]*
+# * lzma
+rm -rf core/lzma/src/*.tar.gz
# * gl2ps
rm graf3d/gl/src/gl2ps.cxx graf3d/gl/inc/gl2ps.h
sed 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' -i graf3d/gl/Module.mk
# * unuran
-rm -rf math/unuran/src/unuran-1.5.1-root.tar.gz
+rm -rf math/unuran/src/*.tar.gz
# * xrootd
rm -rf net/xrootd/src
@@ -1112,6 +1122,7 @@ unset QTINC
--disable-builtin-ftgl \
--disable-builtin-freetype \
--disable-builtin-glew \
+ --disable-builtin-lzma \
--disable-builtin-pcre \
--disable-builtin-zlib \
--enable-asimage \
@@ -1119,18 +1130,17 @@ unset QTINC
--enable-bonjour \
--enable-clarens \
--enable-dcache \
- --enable-editline \
--enable-exceptions \
--enable-explicitlink \
- --enable-fitsio \
--enable-fftw3 \
+ --enable-fitsio \
--enable-gdml \
+ --enable-genvector \
--enable-globus \
--enable-gsl-shared \
--enable-gviz \
--enable-krb5 \
--enable-ldap \
- --enable-genvector \
--enable-mathmore \
--enable-memstat \
--enable-minuit2 \
@@ -1171,6 +1181,7 @@ unset QTINC
%else
--disable-cintex \
%endif
+ --disable-afdsmgrd \
--disable-afs \
--disable-alien \
--disable-alloc \
@@ -1294,6 +1305,7 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/daemons/README
rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/hostcert.conf
rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/*.sample
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/proof/utils
+rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/system.plugins-ios
rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/svninfo.txt
%if %{?fedora}%{!?fedora:0} < 13 && %{?rhel}%{!?rhel:0} < 6
rm ${RPM_BUILD_ROOT}%{_libdir}/%{name}/libAfterImage.a
@@ -1762,6 +1774,7 @@ fi
%files proofd
%defattr(-,root,root,-)
%{_bindir}/proofd
+%{_bindir}/proofexecv
%{_bindir}/proofserv
%{_bindir}/proofserv.exe
%{_bindir}/xproofd
@@ -2183,6 +2196,10 @@ fi
%{_datadir}/%{name}/valgrind-root.supp
%doc %{_defaultdocdir}/%{name}-%{version}/README.PROOF
+%files proof-bench -f includelist-proof-proofbench
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libProofBench.*
+
%files proof-pq2 -f includelist-proof-pq2
%defattr(-,root,root,-)
%{_bindir}/pq2*
@@ -2267,6 +2284,11 @@ fi
%{emacs_lispdir}/root/*.el
%changelog
+* 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
+- New sub-package: root-proof-bench
+
* Wed Jun 29 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.28.00e-2
- Change build requires from qt-devel to qt4-devel
diff --git a/sources b/sources
index efa3738..92e0fea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82d18ee3e2edfd0f1ca737162cdebae6 root-5.28.00e.tar.gz
+7166a6ce24cb87dcc4f233aac6c36405 root-5.30.00.tar.gz
More information about the scm-commits
mailing list