Commit f6db967e authored by Oliver Keeble's avatar Oliver Keeble
Browse files

Patch from Michal for xrootd5

parent 16e5c891
......@@ -156,7 +156,7 @@ Requires: edg-mkgridmap
Requires: fetch-crl
Requires: dmlite-apache-httpd = %{version}
Requires: davix >= 0.6.7
Requires: xrootd >= 1:4.12.3
Requires: xrootd >= 1:5.0.2
Obsoletes: emi-dpm_mysql
Obsoletes: dpmhead
......@@ -330,10 +330,10 @@ This package provides the core libraries of dmlite.
Summary: The dome daemon
Group: Applications/Internet
Requires: httpd
Requires: xrootd >= 1:4.12.3
BuildRequires: xrootd-devel >= 1:4.12.3
BuildRequires: xrootd-server-devel >= 1:4.12.3
BuildRequires: xrootd-private-devel >= 1:4.12.3
Requires: xrootd >= 1:5.0.2
BuildRequires: xrootd-devel >= 1:5.0.2
BuildRequires: xrootd-server-devel >= 1:5.0.2
BuildRequires: xrootd-private-devel >= 1:5.0.2
%description dome
This package provides the binaries necessary to run the dome daemon.
......@@ -493,9 +493,9 @@ Requires(preun): chkconfig
Requires(preun): initscripts
Requires(post): chkconfig
Requires(postun): initscripts
Requires: xrootd >= 1:4.12.3
Requires: xrootd-client >= 1:4.12.3
Requires: xrootd-selinux >= 1:4.12.3
Requires: xrootd >= 1:5.0.2
Requires: xrootd-client >= 1:5.0.2
Requires: xrootd-selinux >= 1:5.0.2
Conflicts: vomsxrd <= 1:0.2.0
Conflicts: xrootd-server-atlas-n2n-plugin <= 2.1
Conflicts: xrootd-alicetokenacc <= 1.2.2
......@@ -531,18 +531,18 @@ fi
%config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmdisk.cfg
%config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmfedredir_atlas.cfg
%config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmredir.cfg
%{_libdir}/libXrdDPMDiskAcc-4.so
%{_libdir}/libXrdDPMDiskAcc.so-4.3
%{_libdir}/libXrdDPMFinder-4.so
%{_libdir}/libXrdDPMFinder.so-4.3
%{_libdir}/libXrdDPMOss-4.so
%{_libdir}/libXrdDPMOss.so-4.3
%{_libdir}/libXrdDPMRedirAcc-4.so
%{_libdir}/libXrdDPMRedirAcc.so-4.3
%{_libdir}/libXrdDPMStatInfo-4.so
%{_libdir}/libXrdDPMStatInfo.so-4.3
%{_libdir}/libXrdDPMCks-4.so
%{_libdir}/libXrdDPMCks.so-4.3
%{_libdir}/libXrdDPMDiskAcc-5.so
%{_libdir}/libXrdDPMDiskAcc.so-5.3
%{_libdir}/libXrdDPMFinder-5.so
%{_libdir}/libXrdDPMFinder.so-5.3
%{_libdir}/libXrdDPMOss-5.so
%{_libdir}/libXrdDPMOss.so-5.3
%{_libdir}/libXrdDPMRedirAcc-5.so
%{_libdir}/libXrdDPMRedirAcc.so-5.3
%{_libdir}/libXrdDPMStatInfo-5.so
%{_libdir}/libXrdDPMStatInfo.so-5.3
%{_libdir}/libXrdDPMCks-5.so
%{_libdir}/libXrdDPMCks.so-5.3
......@@ -788,12 +788,12 @@ mkdir -p %{basefolder}/voms
tar zxvf src/puppet/lcgdm-voms-*.tar.gz -C %{basefolder}/voms/ --strip-components 1
## for dpm-xrootd
ln -s libXrdDPMFinder-4.so %{buildroot}%{_libdir}/libXrdDPMFinder.so-4.3
ln -s libXrdDPMDiskAcc-4.so %{buildroot}%{_libdir}/libXrdDPMDiskAcc.so-4.3
ln -s libXrdDPMOss-4.so %{buildroot}%{_libdir}/libXrdDPMOss.so-4.3
ln -s libXrdDPMRedirAcc-4.so %{buildroot}%{_libdir}/libXrdDPMRedirAcc.so-4.3
ln -s libXrdDPMStatInfo-4.so %{buildroot}%{_libdir}/libXrdDPMStatInfo.so-4.3
ln -s libXrdDPMCks-4.so %{buildroot}%{_libdir}/libXrdDPMCks.so-4.3
ln -s libXrdDPMFinder-5.so %{buildroot}%{_libdir}/libXrdDPMFinder.so-5.3
ln -s libXrdDPMDiskAcc-5.so %{buildroot}%{_libdir}/libXrdDPMDiskAcc.so-5.3
ln -s libXrdDPMOss-5.so %{buildroot}%{_libdir}/libXrdDPMOss.so-5.3
ln -s libXrdDPMRedirAcc-5.so %{buildroot}%{_libdir}/libXrdDPMRedirAcc.so-5.3
ln -s libXrdDPMStatInfo-5.so %{buildroot}%{_libdir}/libXrdDPMStatInfo.so-5.3
ln -s libXrdDPMCks-5.so %{buildroot}%{_libdir}/libXrdDPMCks.so-5.3
## for dpm-dsi
install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp
......
......@@ -22,15 +22,15 @@ set(Dome_SOURCES DomeGenQueue.cpp
include_directories(${DAVIX_PKG_INCLUDE_DIRS})
set ( CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}" )
add_library (dome-4 SHARED ${Dome_SOURCES} ${DMLITE_UTILS_SOURCES} ${DMLITE_DAVIX_POOL_SOURCES})
target_link_libraries (dome-4 ${XROOTD_LIBRARIES} ${XROOTD_LIBRARIES_HTTP} ${DAVIX_PKG_LIBRARIES} ${MYSQL_LIBRARIES} ${Boost_LIBRARIES} crypto dmlite pthread dl)
add_library (dome-5 SHARED ${Dome_SOURCES} ${DMLITE_UTILS_SOURCES} ${DMLITE_DAVIX_POOL_SOURCES})
target_link_libraries (dome-5 ${XROOTD_LIBRARIES} ${XROOTD_LIBRARIES_HTTP} ${DAVIX_PKG_LIBRARIES} ${MYSQL_LIBRARIES} ${Boost_LIBRARIES} crypto dmlite pthread dl)
add_executable (dome-checksum DomeChecksum.cpp)
target_link_libraries (dome-checksum z crypto ssl ${DAVIX_PKG_LIBRARIES})
# Install
install (TARGETS dome-4
install (TARGETS dome-5
DESTINATION ${INSTALL_PFX_LIB}
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
......
......@@ -12,41 +12,41 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/XrdCompileVersion.hh
#
# the Finder library
#
add_library(XrdDPMFinder-4 SHARED XrdDPMFinder.cc XrdDPMFinderConfig.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMFinder-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
add_library(XrdDPMFinder-5 SHARED XrdDPMFinder.cc XrdDPMFinderConfig.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMFinder-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
#
# the Oss library
#
add_library(XrdDPMOss-4 SHARED XrdDPMOss.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMOss-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
add_library(XrdDPMOss-5 SHARED XrdDPMOss.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMOss-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
#
# the Acc library for the disk server
#
add_library(XrdDPMDiskAcc-4 SHARED XrdDPMDiskAcc.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMDiskAcc-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
add_library(XrdDPMDiskAcc-5 SHARED XrdDPMDiskAcc.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMDiskAcc-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
#
# the Acc library for the redirector
#
add_library(XrdDPMRedirAcc-4 SHARED XrdDPMRedirAcc.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMRedirAcc-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
add_library(XrdDPMRedirAcc-5 SHARED XrdDPMRedirAcc.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMRedirAcc-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
#
# the StatInfo library for the cmsd
#
add_library(XrdDPMStatInfo-4 SHARED XrdDPMStatInfo.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMStatInfo-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
add_library(XrdDPMStatInfo-5 SHARED XrdDPMStatInfo.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMStatInfo-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
#
# the Checksum library for the redirector
#
add_library(XrdDPMCks-4 SHARED XrdDPMCks.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMCks-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
add_library(XrdDPMCks-5 SHARED XrdDPMCks.cc XrdDPMCommon.cc)
target_link_libraries(XrdDPMCks-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES})
#
# install libraries
#
install(TARGETS XrdDPMOss-4 XrdDPMDiskAcc-4 XrdDPMFinder-4 XrdDPMRedirAcc-4 XrdDPMStatInfo-4 XrdDPMCks-4
install(TARGETS XrdDPMOss-5 XrdDPMDiskAcc-5 XrdDPMFinder-5 XrdDPMRedirAcc-5 XrdDPMStatInfo-5 XrdDPMCks-5
DESTINATION ${INSTALL_PFX_LIB})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment