Accepting request 157961 from filesystems

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/157961
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=8

glusterd.service

@@ -2,7 +2,7 @@
 Description=Gluster elastic volume management daemon
 
 [Service]
-ExecStart=/usr/sbin/glusterd
+ExecStart=/usr/sbin/glusterd -N
 
 [Install]
 WantedBy=multi-user.target

glusterfs-3.4.0alpha.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2acd86435bbc48832e57aa39d5a8d1060ca0c92c9fe5c69c868cc9df67bca564
+size 1963644

glusterfs-3.4.0qa2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d25207e5c53ee6a79a8da10125f71d6635a9043ec9cab3b717a5453e7ffd5c9
-size 1689560

glusterfs-date.diff

@@ -15,11 +15,11 @@ not needed
  libglusterfs/src/graph.c    |    4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: glusterfs-3.3.0/cli/src/cli.c
+Index: glusterfs-3.4.0alpha/cli/src/cli.c
 ===================================================================
---- glusterfs-3.3.0.orig/cli/src/cli.c
+--- glusterfs-3.4.0alpha.orig/cli/src/cli.c
-+++ glusterfs-3.3.0/cli/src/cli.c
++++ glusterfs-3.4.0alpha/cli/src/cli.c
-@@ -80,7 +80,7 @@ extern int connected;
+@@ -70,7 +70,7 @@ extern int connected;
  /* using argp for command line parsing */
  
  const char *argp_program_version = ""                                 \
@@ -28,24 +28,24 @@ Index: glusterfs-3.3.0/cli/src/cli.c
          "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"  \
          "Copyright (c) 2006-2011 Gluster Inc. "                       \
          "<http://www.gluster.com>\n"                                  \
-Index: glusterfs-3.3.0/glusterfsd/src/glusterfsd.c
+Index: glusterfs-3.4.0alpha/glusterfsd/src/glusterfsd.c
 ===================================================================
---- glusterfs-3.3.0.orig/glusterfsd/src/glusterfsd.c
+--- glusterfs-3.4.0alpha.orig/glusterfsd/src/glusterfsd.c
-+++ glusterfs-3.3.0/glusterfsd/src/glusterfsd.c
++++ glusterfs-3.4.0alpha/glusterfsd/src/glusterfsd.c
-@@ -90,7 +90,7 @@ static char gf_doc[] = "";
+@@ -80,7 +80,7 @@ static char gf_doc[] = "";
  static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n"       \
          "--volfile=VOLFILE [MOUNT-POINT]";
- const char *argp_program_version = "" \
+ const char *argp_program_version = ""
--        PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
+-        PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__
-+        PACKAGE_NAME" "PACKAGE_VERSION \
++        PACKAGE_NAME" "PACKAGE_VERSION" built on *bleep* "
-         "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"  \
+         "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n"
-         "Copyright (c) 2006-2011 Gluster Inc. "             \
+         "Copyright (c) 2006-2013 Red Hat, Inc. <http://www.redhat.com/>\n"
-         "<http://www.gluster.com>\n"                                \
+         "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"
-Index: glusterfs-3.3.0/libglusterfs/src/graph.c
+Index: glusterfs-3.4.0alpha/libglusterfs/src/graph.c
 ===================================================================
---- glusterfs-3.3.0.orig/libglusterfs/src/graph.c
+--- glusterfs-3.4.0alpha.orig/libglusterfs/src/graph.c
-+++ glusterfs-3.3.0/libglusterfs/src/graph.c
++++ glusterfs-3.4.0alpha/libglusterfs/src/graph.c
-@@ -45,8 +45,8 @@ _gf_dump_details (int argc, char **argv)
+@@ -40,8 +40,8 @@ _gf_dump_details (int argc, char **argv)
          fprintf (gf_log_logfile,
                   "========================================"
                   "========================================\n");

glusterfs.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Feb 28 21:58:02 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 3.4.0alpha (rpm: 3.4.0~qa9)
+* automake-1.13 support
+- Enable AIO support
+
+-------------------------------------------------------------------
+Tue Nov 27 11:28:36 UTC 2012 - jengelh@inai.de
+
+- Use `glusterd -N` in glusterd.service to run in foreground
+  as required
+
 -------------------------------------------------------------------
 Tue Nov 27 10:59:15 UTC 2012 - cfarrell@suse.com
 

glusterfs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glusterfs
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,24 +21,24 @@ Name:           glusterfs
 %define lname_rpc	libgfrpc0
 %define lname_xdr	libgfxdr0
 %define lname_gf	libglusterfs0
-Version:        3.4.0~qa2
+Version:        3.4.0~qa9
 Release:        0
-%define rversion	3.4.0qa2
+%define rversion	3.4.0alpha
 Summary:        Aggregating distributed file system
 License:        GPL-2.0 or LGPL-3.0+
 Group:          System/Filesystems
 Url:            http://gluster.org/
 
 #Git-Clone:	git://github.com/gluster/glusterfs
+#Git-Clone:	git://github.com/fvzwieten/lsgvt
 Source:         %name-%rversion.tar.xz
 Source3:        glusterd.service
 Patch1:         glusterfs-date.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
-BuildRequires:  libtool
+BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  readline-devel
@@ -121,7 +121,6 @@ links.
 %patch -P 1 -p1
 
 %build
-./autogen.sh;
 %configure --disable-static
 # This section is not parallel safe or so due to bison/lex
 make -C libglusterfs/src
@@ -211,6 +210,7 @@ install -pm0644 "%{S:3}" "$b/%_unitdir/";
 %if 0%{?_unitdir:1}
 %_unitdir/glusterd.service
 %endif
+%_prefix/lib/ocf
 
 %files -n %lname_api
 %defattr(-,root,root)