X-Git-Url: https://git.tld-linux.org/?p=packages%2Fglusterfs.git;a=blobdiff_plain;f=glusterfs.spec;h=d3dd361126c51d77e0e4a67849634672a1057319;hp=f202d1c414292610c8aaf5d436102000392ff982;hb=HEAD;hpb=fa28b61da380699fd3b9d3a56e0f2186d9ee161a

diff --git a/glusterfs.spec b/glusterfs.spec
index f202d1c..d3dd361 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -13,13 +13,15 @@
 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
+Version:	10.5
 Release:	1
 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
+# Source0-md5:	8ac48f7b7f9afa0e5dfa9ad42589ee27
 Source1:	glusterfsd.init
+Patch0:		ssl_paths.patch
+Patch1:		ksh_getopts.patch
 URL:		https://www.gluster.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.50
@@ -265,6 +267,8 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -311,14 +315,9 @@ 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
 /sbin/chkconfig --add glusterfsd
 %service glusterfsd restart
-# TODO?
-#glusterd --xlator-option *.upgrade=on -N
 
 %preun server
 if [ "$1" = "0" ]; then
@@ -328,7 +327,6 @@ fi
 
 %post geo-replication
 %service glusterd restart
-%endif
 
 %files common
 %defattr(644,root,root,755)
@@ -415,6 +413,8 @@ fi
 
 %{_mandir}/man8/glusterfs.8*
 %{_mandir}/man8/glusterfsd.8*
+
+%dir %{_var}/lib/glusterd
 %dir %{_var}/log/glusterfs
 
 %files libs
@@ -484,7 +484,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