Merge pull request #2570 from iahmad-khan/xrood76xstable

updates xrootd to 4.4.1
cms-sw · Oct 14, 2016 · ce02a10 · ce02a10
2 parents 4067a78 + f8071cf
commit ce02a10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/xrootd-toolfile.spec b/xrootd-toolfile.spec
@@ -1,4 +1,4 @@
-### RPM external xrootd-toolfile 1.0
+### RPM external xrootd-toolfile 2.0
 Requires: xrootd
 %prep
 
@@ -15,7 +15,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/xrootd.xml
     <environment name="XROOTD_BASE" default="@TOOL_ROOT@"/>
     <environment name="INCLUDE" default="$XROOTD_BASE/include/xrootd"/>
     <environment name="INCLUDE" default="$XROOTD_BASE/include/xrootd/private"/>
-    <environment name="LIBDIR" default="$XROOTD_BASE/lib"/>
+    <environment name="LIBDIR" default="$XROOTD_BASE/lib64"/>
   </client>
   <runtime name="PATH" value="$XROOTD_BASE/bin" type="path"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>

diff --git a/xrootd.spec b/xrootd.spec
@@ -1,8 +1,7 @@
-### RPM external xrootd 4.0.4
+### RPM external xrootd 4.4.1
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
-%define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
-%define tag fd6a46e92040ebb2c6897f60bc74c6490212c95a
-%define branch cms/v4.0.4
+%define tag 11badbceef2ba6067075121b09c940130861b5f7
+%define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/xrootd.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz