- updated to 3.5.1

- updated link patch

diff --git a/glusterfs-link.patch b/glusterfs-link.patch
index e73f17e34b8290af06100418fd7a02c27bf9145c..263b6eccf91cccf6c1b5e8e758f948e02c794bcf 100644 (file)
--- a/glusterfs-link.patch
+++ b/glusterfs-link.patch
@@ -26,14 +26,14 @@
  
  libgfxdr_la_SOURCES =  xdr-generic.c rpc-common-xdr.c \
                        glusterfs3-xdr.c \
---- glusterfs-3.5.0/xlators/features/compress/src/Makefile.am.orig     2014-04-17 09:17:07.000000000 +0200
-+++ glusterfs-3.5.0/xlators/features/compress/src/Makefile.am  2014-05-18 16:27:41.060277065 +0200
+--- glusterfs-3.5.1/xlators/features/compress/src/Makefile.am.orig     2014-06-29 11:36:20.398339217 +0200
++++ glusterfs-3.5.1/xlators/features/compress/src/Makefile.am  2014-06-29 11:47:06.574992416 +0200
 @@ -4,10 +4,10 @@
  
  noinst_HEADERS = cdc.h cdc-mem-types.h
  
--cdc_la_LDFLAGS = -module -avoidversion $(LIBZ_LIBS)
-+cdc_la_LDFLAGS = -module -avoidversion
+-cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS)
++cdc_la_LDFLAGS = -module -avoid-version
  
  cdc_la_SOURCES = cdc.c cdc-helper.c
 -cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la

diff --git a/glusterfs.spec b/glusterfs.spec
index f5c5b591e1f04903e0537de5bde505d45235080a..686080158b1920eb5a37dd29f59bb251c0b8e7b5 100644 (file)
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -14,12 +14,12 @@
 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:       3.5.0
+Version:       3.5.1
 Release:       1
 License:       LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
 Group:         Applications/System
 Source0:       http://download.gluster.org/pub/gluster/glusterfs/LATEST/glusterfs-%{version}.tar.gz
-# Source0-md5: 5c141ba3e5306d550d9092e3d1ad6d50
+# Source0-md5: a68114c60a7d35831657116a68a42040
 Source1:       glusterfsd.init
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-noquiet.patch
@@ -29,6 +29,7 @@ BuildRequires:        automake
 BuildRequires: bison
 BuildRequires: device-mapper-devel >= 2.02.79
 BuildRequires: flex
+BuildRequires: glib2-devel >= 2.0
 BuildRequires: libaio-devel
 BuildRequires: libfuse-devel >= 2.6
 %{?with_ibverbs:BuildRequires: libibverbs-devel >= 1.0.4}
@@ -196,9 +197,10 @@ Agenci OCF do monitorowania procesów GlusterFS-a.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%{__python} gen-headers.py
-%{__mv} gf-error-codes.h libglusterfs/src
+#%{__python} gen-headers.py
+#%{__mv} gf-error-codes.h libglusterfs/src
 %configure \
        --disable-silent-rules \
        --enable-fusermount \
@@ -243,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README THANKS
 %dir %{_sysconfdir}/%{name}
+%attr(755,root,root) %{_sbindir}/glfsheal
 # NOTE: glusterfs is link to glusterfsd and is needed by client mount
 %attr(755,root,root) %{_sbindir}/glusterfs
 %attr(755,root,root) %{_sbindir}/glusterfsd