[XrdSsi] Updates xrootd spec file

Updates to XRootD SSI to fix bug with using SSI + OFS similtaneously

xroot_rpms/build_rpms

+#!/bin/sh
+
+# Ensure Docker is running
+
+HAS_DOCKER=$(ps ax|grep dockerd-current|grep -v grep|wc -l)
+if [ $HAS_DOCKER -eq 0 ]
+then
+  echo -n Starting Docker...
+  sudo systemctl start docker
+  echo done.
+fi
+
+sudo docker build . -f ./Dockerfile -t buildxroot
+
+id=$(sudo docker create buildxroot bash)
+
+echo $id

xroot_rpms/build-rpms → xroot_rpms/get_rpms

 #!/bin/sh
 
-sudo docker build . -f ./Dockerfile -t buildxroot
-
-id=$(sudo docker create buildxroot bash)
+id=$1
 
+sudo docker cp ${id}:xrootd/packaging/rhel/xrootd.spec.in .
 sudo docker cp ${id}:rpmbuild_xrootd/RPMS/noarch/ .
 sudo docker cp ${id}:rpmbuild_xrootd/RPMS/x86_64/ .
 
-sudo docker rm -v ${id}
+#sudo docker rm -v ${id}

xroot_rpms/xrootd.spec.in

@@ -390,11 +390,18 @@ export CXX=clang++
 
 mkdir build
 pushd build
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 %if %{?_with_tests:1}%{!?_with_tests:0}
-cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=TRUE -DUSE_LIBC_SEMAPHORE=%{use_libc_semaphore} ../
+      -DENABLE_TESTS=TRUE \
 %else
-cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_LIBC_SEMAPHORE=%{use_libc_semaphore} ../
+      -DENABLE_TESTS=FALSE \
 %endif
+%if %{?_with_ceph:1}%{!?_with_ceph:0}
+      -DENABLE_CEPH=TRUE \
+%else
+      -DENABLE_CEPH=FALSE \
+%endif
+      -DUSE_LIBC_SEMAPHORE=%{use_libc_semaphore} ../
 
 make -i VERBOSE=1 %{?_smp_mflags}
 popd
@@ -472,7 +479,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xrootd
 
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/xrootd@.service $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 packaging/common/xrdhttp.socket   $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 packaging/common/xrdhttp@.socket   $RPM_BUILD_ROOT%{_unitdir}
+install -m 644 packaging/common/xrootd@.socket    $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/cmsd@.service $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/frm_xfrd@.service $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 packaging/common/frm_purged@.service $RPM_BUILD_ROOT%{_unitdir}
@@ -503,6 +511,9 @@ install -m 644 packaging/common/xrootd-clustered.cfg $RPM_BUILD_ROOT%{_sysconfdi
 install -m 644 packaging/common/xrootd-standalone.cfg $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/xrootd-standalone.cfg
 install -m 644 packaging/common/xrootd-filecache-clustered.cfg $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/xrootd-filecache-clustered.cfg
 install -m 644 packaging/common/xrootd-filecache-standalone.cfg $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/xrootd-filecache-standalone.cfg
+%if %{use_systemd}
+install -m 644 packaging/common/xrootd-http.cfg $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/xrootd-http.cfg
+%endif
 
 # client plug-in config
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xrootd/client.plugins.d
@@ -664,6 +675,9 @@ fi
 %attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/xrootd/xrootd-standalone.cfg
 %attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/xrootd/xrootd-filecache-clustered.cfg
 %attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/xrootd/xrootd-filecache-standalone.cfg
+%if %{use_systemd}
+%attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/xrootd/xrootd-http.cfg
+%endif
 %attr(-,xrootd,xrootd) %dir %{_var}/log/xrootd
 %attr(-,xrootd,xrootd) %dir %{_var}/run/xrootd
 %attr(-,xrootd,xrootd) %dir %{_var}/spool/xrootd
@@ -740,8 +754,13 @@ fi
 %{_libdir}/libXrdFileCache-4.so
 %{_libdir}/libXrdBlacklistDecision-4.so
 %{_libdir}/libXrdHttp-4.so
+%{_libdir}/libXrdN2No2p-4.so
 %{_libdir}/libXrdOssSIgpfsT-4.so
 %{_libdir}/libXrdServer.so.*
+%{_libdir}/libXrdSsi-4.so
+%{_libdir}/libXrdSsiLib.so.*
+%{_libdir}/libXrdSsiLog-4.so
+%{_libdir}/libXrdSsiShMap.so.*
 %{_libdir}/libXrdThrottle-4.so
 
 %files server-devel
@@ -795,14 +814,12 @@ fi
 
 %files ssi-libs
 %defattr(-,root,root,-)
-%{_libdir}/libXrdSsi-4.so
 %{_libdir}/libXrdSsiLib.so.1.0.0
-%{_libdir}/libXrdSsiLog-4.so
 %{_libdir}/libXrdSsiShMap.so.1.0.0
 
 %files ssi-devel
 %defattr(-,root,root,-)
-%{_includedir}/xrootd/XrdSsi
+%{_includedir}/xrootd/private/XrdSsi
 %{_libdir}/libXrdSsiLib.so
 %{_libdir}/libXrdSsiLib.so.1
 %{_libdir}/libXrdSsiShMap.so