From fd8597503a540d524bfce1b4c28da3f18931de65 Mon Sep 17 00:00:00 2001
From: Joerg Steffens <joerg.steffens@bareos.com>
Date: Fri, 13 Oct 2017 18:55:54 +0200
Subject: [PATCH] bareos-storage-objectstorage: enable packaging

packaging is done for RHEL7 and SLES12.
---
 platforms/packaging/bareos.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/platforms/packaging/bareos.spec b/platforms/packaging/bareos.spec
index 18a73ad1206..b8bdf1a1041 100644
--- a/platforms/packaging/bareos.spec
+++ b/platforms/packaging/bareos.spec
@@ -80,6 +80,7 @@ Vendor: 	The Bareos Team
 # SLES 12
 %if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
 %define ceph 1
+%define objectstorage 1
 %endif
 
 #
@@ -102,11 +103,15 @@ Vendor: 	The Bareos Team
 %define python_plugins 0
 %endif
 
-%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 || 0%{?fedora_version} >= 19
-%define systemd_support 1
-%if 0%{?fedora_version} != 19
+%if 0%{?fedora_version} >= 20
 %define glusterfs 1
+%define systemd_support 1
 %endif
+
+%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
+%define glusterfs 1
+%define objectstorage 1
+%define systemd_support 1
 %endif
 
 %if 0%{?rhel_version} >= 700
@@ -316,7 +321,6 @@ Summary:    Object Storage support for the Bareos Storage daemon
 Group:      Productivity/Archiving/Backup
 Requires:   %{name}-common  = %{version}
 Requires:   %{name}-storage = %{version}
-Requires:   libdroplet-common
 %endif
 
 %if 0%{?glusterfs}
@@ -1017,8 +1021,8 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %defattr(-, root, root)
 %{backend_dir}/libbareossd-chunked*.so
 %{backend_dir}/libbareossd-object*.so
-%{_sysconfdir}/bareos/bareos-dir.d/storage/Object.conf.example
-%{_sysconfdir}/bareos/bareos-sd.d/device/ObjectStorage.conf.example
+%attr(0640, %{director_daemon_user},%{daemon_group}) %{_sysconfdir}/bareos/bareos-dir.d/storage/Object.conf.example
+%attr(0640, %{storage_daemon_user},%{daemon_group})  %{_sysconfdir}/bareos/bareos-sd.d/device/ObjectStorage.conf.example
 %endif
 
 %if 0%{?glusterfs}