Merge pull request #9672 from cms-sw/xrootd-4.12.9-cmssw-9.4.x

[CMSSW_9_4_X] Update XRootD to 4.12.9

py2-pippkgs.spec

@@ -117,7 +117,7 @@ for pkg in %builddirectpkgreqs ; do
       fi
     done
     echo "Copying $SOURCE in %{pkgrel}"
-    rsync -av $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/
+    rsync -av --no-owner --no-group $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/
   fi
 done
 
@@ -134,7 +134,7 @@ for pkg in %builddirectpkgreqs ; do
       fi
     done
     echo "Copying $SOURCE in %{pkgrel}"
-    rsync -av $SOURCE/ %{i}/bin/
+    rsync -av --no-owner --no-group $SOURCE/ %{i}/bin/
   fi
 done
 

py2-pippkgs_depscipy.spec

@@ -63,7 +63,7 @@ for pkg in %builddirectpkgreqs ; do
       fi
     done
     echo "Copying $SOURCE in %{pkgrel}"
-    rsync -av $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/
+    rsync -av --no-owner --no-group $SOURCE/ %{i}/${PYTHON_LIB_SITE_PACKAGES}/
   fi
 done
 
@@ -80,7 +80,7 @@ for pkg in %builddirectpkgreqs ; do
       fi
     done
     echo "Copying $SOURCE in %{pkgrel}"
-    rsync -av $SOURCE/ %{i}/bin/
+    rsync -av --no-owner --no-group $SOURCE/ %{i}/bin/
   fi
 done
 

tkonlinesw.spec

@@ -1,8 +1,8 @@
-### RPM external tkonlinesw 4.1.0-1
+### RPM external tkonlinesw 4.1.0.1
 
 %define projectname trackerDAQ
 %define releasename %{projectname}-4.1-tkonline
-Source0: http://cms-trackerdaq-service.web.cern.ch/cms-trackerdaq-service/download/sources/trackerDAQ-%{realversion}.tgz
+Source0: http://cms-trackerdaq-service.web.cern.ch/cms-trackerdaq-service/download/sources/trackerDAQ-4.1.0-1.tgz
 Patch0: tkonlinesw-2.7.0-macosx
 Patch1: tkonlinesw-4.0-clang-hash_map
 Patch2: trackerDAQ-4.1-cleanup-gcc7

xrootd-toolfile.spec

@@ -21,6 +21,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml
   <runtime name="PYTHONPATH" value="$XROOTD_BASE/@PYTHON_LIB_SITE_PACKAGES@" type="path"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
   <use name="root_cxxdefaults"/>
+  <use name="libuuid"/>
 </tool>
 EOF_TOOLFILE
 export PYTHON_LIB_SITE_PACKAGES

xrootd.spec

@@ -1,26 +1,16 @@
-### RPM external xrootd 4.6.1
+### RPM external xrootd 4.12.9
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
-%define tag 406ec963de0c7d402ba766e6954ddda7f76c8449
-%define branch cms/v4.6.1
-%define github_user cms-externals
-Source: git+https://github.com/%github_user/xrootd.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+Source: https://github.com/xrootd/xrootd/archive/refs/tags/v%{realversion}.tar.gz
 
 BuildRequires: cmake
 Requires: zlib
 Requires: openssl
 Requires: python
+Requires: libuuid
 
 %prep
 %setup -n %n-%{realversion}
-
-# need to fix these from xrootd git
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/cleanup.pl
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/loadRTDataToMySQL.pl
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/xrdmonCollector.pl
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/prepareMySQLStats.pl
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/xrdmonCreateMySQL.pl
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/xrdmonLoadMySQL.pl
-perl -p -i -e 's|^#!.*perl(.*)|#!/usr/bin/env perl$1|' src/XrdMon/xrdmonPrepareStats.pl
+sed -i -e 's|^ *check_library_exists("uuid" "uuid_generate_random".*$|set(_have_libuuid True)|' cmake/FindLibUuid.cmake
 
 %build
 mkdir build
@@ -39,7 +29,9 @@ cmake ../ \
   -DENABLE_CRYPTO=TRUE \
   -DCMAKE_SKIP_RPATH=TRUE \
   -DENABLE_PYTHON=TRUE \
-  -DCMAKE_PREFIX_PATH="${PYTHON_ROOT}"
+  -DCMAKE_CXX_FLAGS="-I${LIBUUID_ROOT}/include" \
+  -DCMAKE_SHARED_LINKER_FLAGS="-L${LIBUUID_ROOT}/lib64" \
+  -DCMAKE_PREFIX_PATH="${PYTHON_ROOT};${LIBUUID_ROOT}"
 
 # Use makeprocess macro, it uses compiling_processes defined by
 # build configuration file or build argument