From c584b7851662c073a27f9aba627228c5c0d74561 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Fri, 14 Jun 2019 14:49:03 +0200
Subject: [PATCH] Split cta-rmcd package into cta-rmcd and cta-smc
---
.../ctafrontend/cc7/opt/run/bin/rmcd.sh | 4 ++--
cta.spec.in | 19 ++++++++++++++-----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh
index 22b7579b6f..ecfddc79fd 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh
@@ -26,7 +26,7 @@ CTA_RMCD_OPTIONS=/dev/smc
EOF
# install RPMs?
- test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd
+ test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd cta-smc
# rmcd will be running as non root user, we need to fix a few things:
# device access rights
@@ -41,7 +41,7 @@ EOF
else
# systemd is not available
# install RPMs?
- test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd
+ test -e /etc/buildtreeRunner || yum -y install mt-st mtx lsscsi sg3_utils cta-rmcd cta-smc
# to get rmcd logs to stdout
tail -F /var/log/cta/cta-rmcd.log &
diff --git a/cta.spec.in b/cta.spec.in
index aabceb230d..093965a1c4 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -335,22 +335,19 @@ Scripts and utilities to faciliate working with the CTA catalogue
%attr(0644,root,root) %doc /usr/share/man/man1/cta-database-poll.1cta.gz
%package -n cta-rmcd
-Summary: Tools to faciliate working with rmcd and smc in cta
+Summary: The Remote Media Changer daemon (rmcd)
Group: Application/CTA
Requires: logrotate
Requires: cta-common = %{version}-%{release}
%description -n cta-rmcd
CERN Tape Archive:
-Tools to faciliate working with rmcd and smc in cta
+The Remote Media Changer daemon (rmcd)
%files -n cta-rmcd
%defattr(-,root,root)
%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/cta-rmcd
%attr(0644,root,root) %doc /usr/share/man/man1/cta-rmcd.1cta.gz
%attr(0755,root,root) %{_bindir}/cta-rmcd
-%attr(0755,root,root) %{_bindir}/cta-smc
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-rmcd.conf
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-smc.conf
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-smc.1cta.gz
%attr(0644,root,root) %config(noreplace) /etc/sysconfig/cta-rmcd
%attr(0644,root,root) /etc/systemd/system/cta-rmcd.service
@@ -365,6 +362,18 @@ Tools to faciliate working with rmcd and smc in cta
%systemd_postun cta-rmcd.service
%systemdDaemonReload
+%package -n cta-smc
+Summary: The client of the Remote Media Changer Daemon (rmcd)
+Group: Application/CTA
+%description -n cta-smc
+CERN Tape Archive:
+The client of the Remote Media Changer Daemon (rmcd)
+%files -n cta-smc
+%defattr(-,root,root)
+%attr(0755,root,root) %{_bindir}/cta-smc
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-smc.conf
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-smc.1cta.gz
+
%package -n cta-common
Summary: CERN Tape Archive common items
Group: Application/CTA
--
GitLab