Merge branch 'master' of https://gitlab.cern.ch:8443/cta/CTA

cta.spec.in

@@ -98,10 +98,12 @@ cd build
 %{__make} shortunittests
 %endif
 
+# The packages will be cta-taped, cta-frontend, cta-cli
 
 # The CTA client is the only component of CTA that can be compiled on both SLC6
 # and C77
 %if "%{?dist}" == ".slc6" || "%{?dist}" == ".el6"
+
 %package -n cta-cli
 Summary: CERN Tape Archive: command line interface
 Group: Application/CTA
@@ -112,9 +114,8 @@ The xroot plugin
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/cta
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf
-%else
 
-# The packages will be cta-taped, cta-frontend, cta-cli
+%else
 
 %package -n cta-taped
 Summary: CERN Tape Archive: tape daemon
@@ -133,7 +134,9 @@ The tape server daemon
 %attr(0644,root,root) %config(noreplace) /etc/logrotate.d/cta-taped
 %attr(0755,root,root) %{_bindir}/cta-taped
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta.conf.example
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-taped.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-taped.1cta.gz
+%attr(0644,root,root) /etc/sysconfig/cta-taped
+%attr(0644,root,root) /etc/systemd/system/cta-taped.service
 
 %package -n cta-frontend
 Summary: CERN Tape Archive: Xrootd plugin
@@ -256,11 +259,11 @@ Scripts and utilities to faciliate working with the CTA catalogue
 %attr(0755,root,root) %{_bindir}/cta-catalogue-schema-create
 %attr(0755,root,root) %{_bindir}/cta-catalogue-schema-drop
 %attr(0755,root,root) %{_bindir}/cta-database-poll
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-catalogue-admin-host-create.1cta.gz
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-catalogue-admin-user-create.1cta.gz
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-catalogue-schema-create.1cta.gz
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-catalogue-schema-drop.1cta.gz
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-database-poll.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-admin-host-create.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-admin-user-create.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-schema-create.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-catalogue-schema-drop.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-database-poll.1cta.gz
 
 %package -n cta-mediachangerutils
 Summary: Utilities to faciliate working with mediachangers
@@ -271,6 +274,6 @@ Utilities to faciliate working with the mediachangers
 %files -n cta-mediachangerutils
 %attr(0755,root,root) %{_bindir}/cta-mediachanger-dismount
 %attr(0755,root,root) %{_bindir}/cta-mediachanger-mount
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-mediachanger-dismount.1cta.gz
-%attr(0644,root,bin) %doc /usr/share/man/man1/cta-mediachanger-mount.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-mediachanger-dismount.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-mediachanger-mount.1cta.gz
 %endif

tapeserver/CMakeLists.txt

@@ -15,6 +15,8 @@ target_link_libraries(cta-taped
 install (TARGETS cta-taped DESTINATION usr/bin)
 install (FILES cta-taped.1cta DESTINATION /usr/share/man/man1)
 install (FILES cta-taped.logrotate DESTINATION /etc/logrotate.d RENAME cta-taped)
+install (FILES cta-taped.sysconfig DESTINATION /etc/sysconfig RENAME cta-taped)
+install (FILES cta-taped.service DESTINATION /etc/systemd/system)
 
 # CTA's cta-taped system tests.
 add_library(cta-tapedSystemTests SHARED