diff --git a/root-gfal2.patch b/root-gfal2.patch deleted file mode 100644 index cc1374f..0000000 --- a/root-gfal2.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- root-5.34.18.orig/configure 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/configure 2014-03-19 09:56:58.943322923 +0100 -@@ -1630,7 +1630,7 @@ - fitsio Read images and data from FITS files, requires cfitsio - gviz Graphs visualization support, requires graphviz - gdml GDML writer and reader -- gfal GFAL support, requires libgfal -+ gfal GFAL support, requires libgfal or libgfal2 - globus Globus authentication support, requires Globus toolkit - glite gLite support, requires libglite-api-wrapper v.3 from GSI (https://subversion.gsi.de/trac/dgrid/wiki) - gsl-shared Enable linking against shared libraries for GSL (default no) -@@ -1719,7 +1719,7 @@ - gfal-incdir GFAL support, location of gfal_api.h - srm-ifce-incdir GFAL support, location of gfal_srm_ifce_types.h - glib2-incdir GFAL support, location of glib-2.0 headers -- gfal-libdir GFAL support, location of libgfal -+ gfal-libdir GFAL support, location of libgfal or libgfal2 - glew-incdir GLEW support, location of glew.h - glew-libdir GLEW support, location of libGLEW - gsl-incdir GSL support, location of gsl/gsl_version.h -@@ -3759,10 +3759,17 @@ - gfalinc=$found_hdr - gfalincdir=$found_dir - -- check_library "libgfal" "$enable_shared" "$gfallibdir" \ -- $GFAL ${GFAL:+$GFAL/lib} \ -- /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \ -- /usr/local/gfal/lib -+ if grep -q "GFAL2" $gfalincdir/gfal_api.h ; then -+ check_library "libgfal2" "$enable_shared" "$gfallibdir" \ -+ $GFAL ${GFAL:+$GFAL/lib} \ -+ /opt/lcg/lib /opt/gfal2/lib /usr/local/lcg/lib \ -+ /usr/local/gfal2/lib -+ else -+ check_library "libgfal" "$enable_shared" "$gfallibdir" \ -+ $GFAL ${GFAL:+$GFAL/lib} \ -+ /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \ -+ /usr/local/gfal/lib -+ fi - gfallib=$found_lib - gfallibdir=$found_dir - -diff -ur root-5.34.18.orig/io/gfal/src/TGFALFile.cxx root-5.34.18/io/gfal/src/TGFALFile.cxx ---- root-5.34.18.orig/io/gfal/src/TGFALFile.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/io/gfal/src/TGFALFile.cxx 2014-03-19 11:48:13.762930884 +0100 -@@ -60,7 +60,6 @@ - // // - ////////////////////////////////////////////////////////////////////////// - --#include "TGFALFile.h" - #include "TROOT.h" - #include "TUrl.h" - -@@ -68,6 +67,18 @@ - #include - } - -+// GFAL2 doesn't use special names for 64 bit versions -+#ifdef _GFAL2_API_ -+#define gfal_lseek64 gfal_lseek -+#define gfal_open64 gfal_open -+#define gfal_readdir64 gfal_readdir -+#define gfal_stat64 gfal_stat -+#define dirent64 dirent -+#define stat64 stat -+#endif -+ -+#include "TGFALFile.h" -+ - ClassImp(TGFALFile) - ClassImp(TGFALSystem) - diff --git a/root-proofx-link-iolib.patch b/root-proofx-link-iolib.patch deleted file mode 100644 index ca06b61..0000000 --- a/root-proofx-link-iolib.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ur root-5.34.18.orig/config/Makefile.depend root-5.34.18/config/Makefile.depend ---- root-5.34.18.orig/config/Makefile.depend 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/config/Makefile.depend 2014-05-04 07:52:08.144211940 +0200 -@@ -38,7 +38,7 @@ - $(THREADLIB) $(MATHCORELIB) - PROOFDRAWLIBDEPM = $(TREEPLAYERLIB) $(G3DLIB) $(GRAFLIB) $(GPADLIB) \ - $(PROOFPLAYERLIB) $(HISTLIB) $(TREELIB) $(PROOFLIB) --PROOFXLIBDEPM = $(NETLIB) $(PROOFLIB) $(THREADLIB) -+PROOFXLIBDEPM = $(NETLIB) $(PROOFLIB) $(THREADLIB) $(IOLIB) - PROOFBENCHLIBDEPM = $(PROOFLIB) $(PROOFDRAWLIB) $(PROOFPLAYERLIB) \ - $(TREELIB) $(GRAFLIB) $(HISTLIB) $(GPADLIB) $(IOLIB) - SESSIONVIEWERLIBDEPM = $(PROOFLIB) $(GUILIB) $(HISTLIB) $(GPADLIB) \ -@@ -291,7 +291,8 @@ - lib/libGraf.lib lib/libGpad.lib \ - lib/libProofPlayer.lib lib/libHist.lib \ - lib/libTree.lib lib/libProof.lib --PROOFXLIBEXTRA = lib/libNet.lib lib/libProof.lib lib/libThread.lib -+PROOFXLIBEXTRA = lib/libNet.lib lib/libProof.lib lib/libThread.lib \ -+ lib/libRIO.lib - PROOFBENCHLIBEXTRA = lib/libProof.lib lib/libProofDraw.lib \ - lib/libProofPlayer.lib lib/libTree.lib lib/libGraf.lib \ - lib/libHist.lib lib/libGpad.lib lib/libRIO.lib -@@ -448,7 +449,7 @@ - -lMathCore - PROOFDRAWLIBEXTRA = -Llib -lTreePlayer -lGraf3d -lGraf -lGpad \ - -lProofPlayer -lHist -lTree -lProof --PROOFXLIBEXTRA = -Llib -lNet -lProof -lThread -+PROOFXLIBEXTRA = -Llib -lNet -lProof -lThread -lRIO - PROOFBENCHLIBEXTRA = -Llib -lProof -lProofDraw -lProofPlayer -lTree \ - -lGraf -lHist -lGpad -lRIO - SESSIONVIEWERLIBEXTRA = -Llib -lProof -lGui -lHist -lGpad -lGraf -lTree \ diff --git a/root-thtml-revert.patch b/root-thtml-revert.patch deleted file mode 100644 index a1d1960..0000000 --- a/root-thtml-revert.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- v5-34-00-patches/html/src/THtml.cxx 2012/08/29 09:33:39 45728 -+++ v5-34-00-patches/html/src/THtml.cxx 2012/05/08 15:21:21 44178 -@@ -310,13 +310,11 @@ - if (!filename.EndsWith(fsentry->GetName())) - continue; - fsentry->GetFullName(filesysname, kTRUE); // get the short version -- filename = filesysname; - if (!filename.EndsWith(filesysname)) { -- // It's something - let's see whether we find something better -- // else leave it as plan B. This helps finding Reflex sources. -- //filesysname = ""; -+ filesysname = ""; - continue; - } -+ filename = filesysname; - fsentry->GetFullName(filesysname, kFALSE); // get the long version - if (fse) *fse = fsentry; - break; diff --git a/root.spec b/root.spec index 2701fa1..15669a3 100644 --- a/root.spec +++ b/root.spec @@ -29,12 +29,19 @@ %global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) %endif +# Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4) +%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7 +%global xrootd 0 +%else +%global xrootd 1 +%endif + %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: root -Version: 5.34.18 +Version: 5.34.19 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 4%{?dist} +Release: 1%{?dist} Summary: Numerical data analysis framework Group: Applications/Engineering @@ -68,20 +75,14 @@ Patch3: %{name}-xrootd.patch Patch4: %{name}-meta.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: -Patch7: %{name}-no-extra-formats.patch +Patch6: %{name}-no-extra-formats.patch # Fixes for HDFS module -Patch8: %{name}-hdfs.patch +Patch7: %{name}-hdfs.patch # Don't link to libjvm (handled properly inside libhdfs) -Patch9: %{name}-dont-link-jvm.patch +Patch8: %{name}-dont-link-jvm.patch # Avoid deprecated __USE_BSD -Patch10: %{name}-bsd-misc.patch -# Use GFAL2 -Patch11: %{name}-gfal2.patch -# Link failure on Fedora 21 -Patch12: %{name}-proofx-link-iolib.patch +Patch9: %{name}-bsd-misc.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 @@ -97,6 +98,7 @@ BuildRequires: libXft-devel BuildRequires: libXext-devel BuildRequires: fontconfig-devel BuildRequires: freetype-devel +BuildRequires: fcgi-devel BuildRequires: ftgl-devel BuildRequires: glew-devel BuildRequires: gl2ps-devel @@ -143,8 +145,10 @@ BuildRequires: libtool-ltdl-devel BuildRequires: desktop-file-utils BuildRequires: dcap-devel BuildRequires: dpm-devel +%if %{xrootd} BuildRequires: xrootd-client-devel >= 1:3.3.5 BuildRequires: xrootd-private-devel >= 1:3.3.5 +%endif BuildRequires: cfitsio-devel BuildRequires: davix-devel >= 0.2.8 BuildRequires: gfal2-devel @@ -979,6 +983,15 @@ Group: Applications/Engineering This package contains the LDAP extension for ROOT. This gives you access to LDAP directories via ROOT. +%package net-http +Summary: HTTP server extension for ROOT +Group: Applications/Engineering + +%description net-http +This package contains the HTTP server extension for ROOT. It provides +an http interface to arbitrary ROOT applications. + +%if %{xrootd} %package netx Summary: NetX extension for ROOT Group: Applications/Engineering @@ -987,6 +1000,7 @@ Group: Applications/Engineering This package contains the NetX extension for ROOT, i.e. a client for the xrootd server. Both the old (NetX) and the new (NetXNG) version are provided. +%endif %package proof Summary: PROOF extension for ROOT @@ -1020,6 +1034,7 @@ Group: Applications/Engineering This package contains a library for browsing an interactive PROOF session in ROOT. +%if %{xrootd} %package xproof Summary: XPROOF extension for ROOT Group: Applications/Engineering @@ -1027,6 +1042,7 @@ Group: Applications/Engineering %description xproof This package contains the xproof extension for ROOT. This provides a client to be used in a PROOF environment. +%endif %package roofit Summary: ROOT extension for modeling expected distributions @@ -1175,9 +1191,6 @@ fi %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -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 \ @@ -1225,8 +1238,6 @@ 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/*.tar.gz -# * xrootd -rm -rf net/xrootd/src # Remove unsupported man page macros sed -e '/^\.UR/d' -e '/^\.UE/d' -i man/man1/* @@ -1298,6 +1309,7 @@ unset QTINC %else --disable-hdfs \ %endif + --enable-http \ --enable-krb5 \ --enable-ldap \ --enable-mathmore \ @@ -1338,9 +1350,13 @@ unset QTINC --enable-x11 \ --enable-xft \ --enable-xml \ +%if %{xrootd} --enable-xrootd \ --with-xrootd-incdir=%{_includedir}/xrootd \ --with-xrootd-libdir=%{_libdir} \ +%else + --disable-xrootd \ +%endif %ifarch %{ix86} x86_64 --enable-cintex \ %else @@ -1363,6 +1379,7 @@ unset QTINC --disable-sapdb \ --disable-srp \ --disable-vc \ + --disable-werror \ --fail-on-missing make OPTFLAGS="%{optflags}" \ @@ -1487,6 +1504,9 @@ rm ${RPM_BUILD_ROOT}%{_mandir}/man1/makecint.1 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/proofserva.1 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/roota.1 rm ${RPM_BUILD_ROOT}%{_mandir}/man1/setup-pq2.1 +%if %{xrootd} == 0 +rm ${RPM_BUILD_ROOT}%{_mandir}/man1/xproofd.1 +%endif %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.cw rm ${RPM_BUILD_ROOT}%{_includedir}/%{name}/*.pri @@ -1538,6 +1558,14 @@ rm TVirtualX/P030_TGWin32.C rm TVirtualX/P040_TGQt.C %endif rm TVirtualX/P050_TGQuartz.C +%if %{xrootd} == 0 +rm TFile/P100_TXNetFile.C +rm TFileStager/P010_TXNetFileStager.C +rm TProofMgr/P010_TXProofMgr.C +rm TProofServ/P010_TXProofServ.C +rm TSlave/P010_TXSlave.C +rm TSystem/P040_TXNetSystem.C +%endif rmdir TAFS rmdir TDataProgressDialog rmdir TGrid @@ -1821,14 +1849,20 @@ fi %postun net-krb5 -p /sbin/ldconfig %post net-ldap -p /sbin/ldconfig %postun net-ldap -p /sbin/ldconfig +%post net-http -p /sbin/ldconfig +%postun net-http -p /sbin/ldconfig +%if %{xrootd} %post netx -p /sbin/ldconfig %postun netx -p /sbin/ldconfig +%endif %post proof -p /sbin/ldconfig %postun proof -p /sbin/ldconfig %post proof-sessionviewer -p /sbin/ldconfig %postun proof-sessionviewer -p /sbin/ldconfig +%if %{xrootd} %post xproof -p /sbin/ldconfig %postun xproof -p /sbin/ldconfig +%endif %post roofit -p /sbin/ldconfig %postun roofit -p /sbin/ldconfig %post sql-mysql -p /sbin/ldconfig @@ -1950,15 +1984,19 @@ fi %files proofd %{_bindir}/proofd -%{_bindir}/proofexecv %{_bindir}/proofserv %{_bindir}/proofserv.exe -%{_bindir}/xproofd %{_bindir}/xpdtest +%if %{xrootd} +%{_bindir}/proofexecv +%{_bindir}/xproofd +%endif %{_mandir}/man1/proofd.1* %{_mandir}/man1/proofserv.1* -%{_mandir}/man1/xproofd.1* %{_mandir}/man1/xpdtest.1* +%if %{xrootd} +%{_mandir}/man1/xproofd.1* +%endif %{_initrddir}/proofd %files rootd @@ -2313,12 +2351,19 @@ fi %files net-ldap -f includelist-net-ldap %{_libdir}/%{name}/libRLDAP.* +%files net-http -f includelist-net-http +%{_libdir}/%{name}/libRHTTP.* +%{_datadir}/%{name}/http +%doc net/http/README.txt net/http/civetweb/*.md + +%if %{xrootd} %files netx -f includelist-netx %{_libdir}/%{name}/libNetx.* %{_libdir}/%{name}/libNetxNG.* %{_datadir}/%{name}/plugins/TFile/P100_TXNetFile.C %{_datadir}/%{name}/plugins/TFileStager/P010_TXNetFileStager.C %{_datadir}/%{name}/plugins/TSystem/P040_TXNetSystem.C +%endif %files proof -f includelist-proof-proof %{_libdir}/%{name}/libProof.* @@ -2354,12 +2399,14 @@ fi %{_datadir}/%{name}/plugins/TProofProgressLog/P010_TProofProgressLog.C %{_datadir}/%{name}/plugins/TSessionViewer/P010_TSessionViewer.C +%if %{xrootd} %files xproof -f includelist-proof-proofx %{_libdir}/%{name}/libProofx.* %{_libdir}/%{name}/libXrdProofd.* %{_datadir}/%{name}/plugins/TProofMgr/P010_TXProofMgr.C %{_datadir}/%{name}/plugins/TProofServ/P010_TXProofServ.C %{_datadir}/%{name}/plugins/TSlave/P010_TXSlave.C +%endif %files roofit -f includelist-roofit %{_libdir}/%{name}/libRooFit.* @@ -2409,6 +2456,13 @@ fi %{emacs_lispdir}/root/*.el %changelog +* Mon Jul 14 2014 Mattias Ellert - 5.34.19-1 +- Update to 5.34.19 +- Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4) +- New sub-package: root-net-http +- Drop patches root-thtml-revert.patch, root-gfal2.patch and + root-proofx-link-iolib.patch + * Mon Jun 30 2014 Mattias Ellert - 5.34.18-4 - Add Requires on root-tree-player to root-gui-ged diff --git a/sources b/sources index 500a62f..bcc042a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56c3603bfc416382f20b3b65dcd41b1e root-5.34.18.tar.xz +3c68587354619c0a2d3bb9f77381b1b9 root-5.34.19.tar.xz