- /var/lib/glusterd is used by client too, move to common subpackage

[packages/glusterfs.git] / glusterfs.spec

diff --git a/glusterfs.spec b/glusterfs.spec
index f202d1c414292610c8aaf5d436102000392ff982..5b464cb0fc34c3a11fe63e8144b0d73f383cadaf 100644 (file)
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -14,12 +14,13 @@ Summary:    Clustered File Storage that can scale to peta bytes
 Summary(pl.UTF-8):     Klastrowy system przechowywania plików skalujący się do petabajtów
 Name:          glusterfs
 Version:       10.3
-Release:       1
+Release:       3
 License:       LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
 Group:         Applications/System
 Source0:       https://download.gluster.org/pub/gluster/glusterfs/10/%{version}/glusterfs-%{version}.tar.gz
 # Source0-md5: 9c795c8479f244e81bca5b2499a480cc
 Source1:       glusterfsd.init
+Patch0:                ssl_paths.patch
 URL:           https://www.gluster.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.50
@@ -265,6 +266,7 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -311,7 +313,6 @@ rm -rf $RPM_BUILD_ROOT
 %post  libs    -p /sbin/ldconfig
 %postun        libs    -p /sbin/ldconfig
 
-%if 0
 # TODO: verify these scripts (see also included glusterfs.spec)
 %post server
 # note: glusterfsd.init vs glusterd.service
@@ -328,7 +329,6 @@ fi
 
 %post geo-replication
 %service glusterd restart
-%endif
 
 %files common
 %defattr(644,root,root,755)
@@ -415,6 +415,8 @@ fi
 
 %{_mandir}/man8/glusterfs.8*
 %{_mandir}/man8/glusterfsd.8*
+
+%dir %{_var}/lib/glusterd
 %dir %{_var}/log/glusterfs
 
 %files libs
@@ -484,7 +486,6 @@ fi
 
 %{_mandir}/man8/gluster-setgfid2path.8*
 %{_mandir}/man8/glusterd.8*
-%dir %{_var}/lib/glusterd
 %dir %{_var}/lib/glusterd/groups
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/db-workload
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/groups/distributed-virt