- fix build on x64 where libtool won't install socket.so or ibverbs.so

Changed files:
    glusterfs-transportdir.patch -> 1.1
    glusterfs.spec -> 1.34

diff --git a/glusterfs-transportdir.patch b/glusterfs-transportdir.patch
new file mode 100644 (file)
index 0000000..924dc32
--- /dev/null
+++ b/glusterfs-transportdir.patch
@@ -0,0 +1,24 @@
+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 62a754b788389cf2b883b426f2785448da06d12f..70ef75e93588f282258f43ee8336931ac8e3273a 100644 (file)
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -20,6 +20,7 @@ Group:                Applications/System
 Source0:       http://ftp.gluster.com/pub/gluster/glusterfs/2.0/LATEST/glusterfs-%{version}.tar.gz
 # Source0-md5: 712b6325abbd9f89ac927727a4bad658
 Source1:       glusterfsd.init
+Patch0: %{name}-transportdir.patch
 URL:           http://www.gluster.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -145,6 +146,7 @@ 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