- Version 2.0.9-1. Works for me. TODOs still pending.

Changed files:
    glusterfs-transportdir.patch -> 1.2
    glusterfs.spec -> 1.36

diff --git a/glusterfs-transportdir.patch b/glusterfs-transportdir.patch
deleted file mode 100644 (file)
index 924dc32..0000000
--- a/glusterfs-transportdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur glusterfs-2.0.1-o/transport/ib-verbs/src/Makefile.am glusterfs-2.0.1/transport/ib-verbs/src/Makefile.am
---- glusterfs-2.0.1-o/transport/ib-verbs/src/Makefile.am       2009-06-03 21:43:45.000000000 -0600
-+++ glusterfs-2.0.1/transport/ib-verbs/src/Makefile.am 2009-06-03 22:33:02.000000000 -0600
-@@ -1,7 +1,7 @@
- noinst_HEADERS = ib-verbs.h name.h
- 
- transport_LTLIBRARIES = ib-verbs.la
--transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/
-+transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
- 
- ib_verbs_la_LDFLAGS = -module -avoid-version
- 
-diff -ur glusterfs-2.0.1-o/transport/socket/src/Makefile.am glusterfs-2.0.1/transport/socket/src/Makefile.am
---- glusterfs-2.0.1-o/transport/socket/src/Makefile.am 2009-06-03 21:43:45.000000000 -0600
-+++ glusterfs-2.0.1/transport/socket/src/Makefile.am   2009-06-03 22:33:04.000000000 -0600
-@@ -1,7 +1,7 @@
- noinst_HEADERS = socket.h name.h
- 
- transport_LTLIBRARIES = socket.la
--transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport/
-+transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
- 
- socket_la_LDFLAGS = -module -avoid-version
- 

diff --git a/glusterfs.spec b/glusterfs.spec
index 14f96228375324cac1af42adf59441260306001c..3a9a04d716d18c2e230c10b5cf8f1cd8fb9568c2 100644 (file)
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -11,16 +11,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:       2.0.1
+Version:       2.0.9
 #%%define          _rc        {rc2}
 %define          _version        %{version}
-Release:       0.1
+Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gluster.com/pub/gluster/glusterfs/2.0/LATEST/glusterfs-%{version}.tar.gz
-# Source0-md5: 712b6325abbd9f89ac927727a4bad658
+# Source0-md5: 0467740f423e32bdf2f66d2cf63467f3
 Source1:       glusterfsd.init
-Patch0: %{name}-transportdir.patch
 URL:           http://www.gluster.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -146,7 +145,6 @@ Ten pakiet udostępnia opartego na FUSE klienta GlusterFS-a.
 
 %prep
 %setup -q -n %{name}-%{_version}
-%patch0 -p1
 %{__sed} -i -e 's|-avoidversion|-avoid-version|g'  */*/*/Makefile.am  */*/*/*/Makefile.am
 
 cp -l doc/examples/README README.examples
@@ -189,7 +187,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libglusterfsclient.so.0
 
 %dir %{_libdir}/glusterfs
-# %attr(755,root,root) %{_libdir}/glusterfs/glusterfs-booster.so
+%attr(755,root,root) %{_libdir}/glusterfs/libglusterfs-booster.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/glusterfs/libglusterfs-booster.so.0
+
 %dir %{_libdir}/glusterfs/%{_version}
 %dir %{_libdir}/glusterfs/%{_version}/auth
 %attr(755,root,root) %{_libdir}/glusterfs/%{_version}/auth/addr.so
@@ -254,6 +254,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files client
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/glusterfs-volgen
 %attr(755,root,root) %{_sbindir}/glusterfs
 %attr(755,root,root) %{_sbindir}/glusterfsd
 %attr(755,root,root) /sbin/mount.glusterfs