From 3801e6aa461f320255ba5bf3b00c49f4c53da15578790dc0314ef55cef03bbf8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 28 Feb 2013 22:06:56 +0000 Subject: [PATCH 1/2] glusterfs-3.4.0~qa9 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=20 --- glusterd.service | 2 +- glusterfs-3.4.0alpha.tar.xz | 3 +++ glusterfs-3.4.0qa2.tar.xz | 3 --- glusterfs-date.diff | 36 ++++++++++++++++++------------------ glusterfs.changes | 12 ++++++++++++ glusterfs.spec | 9 +++++---- 6 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 glusterfs-3.4.0alpha.tar.xz delete mode 100644 glusterfs-3.4.0qa2.tar.xz diff --git a/glusterd.service b/glusterd.service index 858e835..f7a37e2 100644 --- a/glusterd.service +++ b/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 diff --git a/glusterfs-3.4.0alpha.tar.xz b/glusterfs-3.4.0alpha.tar.xz new file mode 100644 index 0000000..eee99f9 --- /dev/null +++ b/glusterfs-3.4.0alpha.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2acd86435bbc48832e57aa39d5a8d1060ca0c92c9fe5c69c868cc9df67bca564 +size 1963644 diff --git a/glusterfs-3.4.0qa2.tar.xz b/glusterfs-3.4.0qa2.tar.xz deleted file mode 100644 index 5e95573..0000000 --- a/glusterfs-3.4.0qa2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d25207e5c53ee6a79a8da10125f71d6635a9043ec9cab3b717a5453e7ffd5c9 -size 1689560 diff --git a/glusterfs-date.diff b/glusterfs-date.diff index 6a18251..761f90b 100644 --- a/glusterfs-date.diff +++ b/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.3.0/cli/src/cli.c -@@ -80,7 +80,7 @@ extern int connected; +--- glusterfs-3.4.0alpha.orig/cli/src/cli.c ++++ glusterfs-3.4.0alpha/cli/src/cli.c +@@ -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. " \ "\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.3.0/glusterfsd/src/glusterfsd.c -@@ -90,7 +90,7 @@ static char gf_doc[] = ""; +--- glusterfs-3.4.0alpha.orig/glusterfsd/src/glusterfsd.c ++++ glusterfs-3.4.0alpha/glusterfsd/src/glusterfsd.c +@@ -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 = "" \ -- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \ -+ PACKAGE_NAME" "PACKAGE_VERSION \ - "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \ - "Copyright (c) 2006-2011 Gluster Inc. " \ - "\n" \ -Index: glusterfs-3.3.0/libglusterfs/src/graph.c + const char *argp_program_version = "" +- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ ++ PACKAGE_NAME" "PACKAGE_VERSION" built on *bleep* " + "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" + "Copyright (c) 2006-2013 Red Hat, Inc. \n" + "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n" +Index: glusterfs-3.4.0alpha/libglusterfs/src/graph.c =================================================================== ---- glusterfs-3.3.0.orig/libglusterfs/src/graph.c -+++ glusterfs-3.3.0/libglusterfs/src/graph.c -@@ -45,8 +45,8 @@ _gf_dump_details (int argc, char **argv) +--- glusterfs-3.4.0alpha.orig/libglusterfs/src/graph.c ++++ glusterfs-3.4.0alpha/libglusterfs/src/graph.c +@@ -40,8 +40,8 @@ _gf_dump_details (int argc, char **argv) fprintf (gf_log_logfile, "========================================" "========================================\n"); diff --git a/glusterfs.changes b/glusterfs.changes index 3559029..8fc35f3 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +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 diff --git a/glusterfs.spec b/glusterfs.spec index f6c5889..c001b7b 100644 --- a/glusterfs.spec +++ b/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,15 +21,16 @@ 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 @@ -121,7 +122,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 +211,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) From ae0e8683c432a68b8232bae9da4a04e1f01163577c9c141875de00fbb6c24a78 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 28 Feb 2013 22:10:37 +0000 Subject: [PATCH 2/2] AIO support OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=21 --- glusterfs.changes | 1 + glusterfs.spec | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glusterfs.changes b/glusterfs.changes index 8fc35f3..b12abc3 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -3,6 +3,7 @@ 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 diff --git a/glusterfs.spec b/glusterfs.spec index c001b7b..42567c8 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -35,11 +35,10 @@ 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