From 56bab027bdc1d79ee7f8dfa6c6f6d4d43a8b1c570f96788155969f9b8412d456 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 31 Oct 2012 12:27:28 +0000
Subject: [PATCH] glusterfs-3.3.1

OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=13
---
 glusterd.service       |  8 ++++++++
 glusterfs-3.3.0.tar.xz |  3 ---
 glusterfs-3.3.1.tar.xz |  3 +++
 glusterfs-init.diff    | 38 -----------------------------------
 glusterfs.changes      |  9 +++++++++
 glusterfs.spec         | 45 ++++++++++++++++++++++++++++++------------
 6 files changed, 52 insertions(+), 54 deletions(-)
 create mode 100644 glusterd.service
 delete mode 100644 glusterfs-3.3.0.tar.xz
 create mode 100644 glusterfs-3.3.1.tar.xz
 delete mode 100644 glusterfs-init.diff

diff --git a/glusterd.service b/glusterd.service
new file mode 100644
index 0000000..858e835
--- /dev/null
+++ b/glusterd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Gluster elastic volume management daemon
+
+[Service]
+ExecStart=/usr/sbin/glusterd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/glusterfs-3.3.0.tar.xz b/glusterfs-3.3.0.tar.xz
deleted file mode 100644
index 65d420a..0000000
--- a/glusterfs-3.3.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59f1ae0b1c3ef97768b0b740b7f0146aedd0102d19c19e50fb04ae5990126066
-size 1541028
diff --git a/glusterfs-3.3.1.tar.xz b/glusterfs-3.3.1.tar.xz
new file mode 100644
index 0000000..0900c00
--- /dev/null
+++ b/glusterfs-3.3.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc364b9198947eea1b9b0b7533aaeed6672a2f73e2ee4aada2004a64252d3ec9
+size 1565592
diff --git a/glusterfs-init.diff b/glusterfs-init.diff
deleted file mode 100644
index ace65fa..0000000
--- a/glusterfs-init.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- extras/init.d/glusterd-SuSE.in |   10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-Index: glusterfs-3.2.4/extras/init.d/glusterd-SuSE.in
-===================================================================
---- glusterfs-3.2.4.orig/extras/init.d/glusterd-SuSE.in
-+++ glusterfs-3.2.4/extras/init.d/glusterd-SuSE.in
-@@ -2,8 +2,8 @@
- #
- ### BEGIN INIT INFO
- # Provides:       glusterd
--# Required-Start: $local_fs $network
--# Required-Stop:
-+# Required-Start: $remote_fs $network
-+# Required-Stop: $remote_fs $network
- # Default-Start:  3 5
- # Default-Stop:
- # Short-Description: Gluster File System service for volume management
-@@ -61,13 +61,17 @@ case $1 in
- 	fi
- 	rc_status -v
-        ;;
-+ reload)
-+       rc_failed 3
-+       rc_status -v
-+       ;;
-  restart)
-        $0 stop
-        $0 start
-        rc_status
-        ;;
-  *)
--       echo $"Usage: $0 {start|stop|status|restart}."
-+       echo $"Usage: $0 {start|stop|status|reload|restart}."
-        exit 1
- esac
- 
diff --git a/glusterfs.changes b/glusterfs.changes
index 0a735f4..7fe02b4 100644
--- a/glusterfs.changes
+++ b/glusterfs.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Oct 31 12:19:47 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 3.3.1
+* mount.glusterfs: Add support for {attribute,entry}-timeout options
+* cli: Proper xml output for "gluster peer status"
+* self-heald: Fix inode leak
+* storage/posix: implement native linux AIO support
+
 -------------------------------------------------------------------
 Mon Sep 24 03:45:09 UTC 2012 - jengelh@inai.de
 
diff --git a/glusterfs.spec b/glusterfs.spec
index e0a54d9..80c1761 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -16,11 +16,14 @@
 #
 
 
+#git_master
+%define master 0
 Name:           glusterfs
+%define lname_api	libgfapi0
 %define lname_rpc	libgfrpc0
 %define lname_xdr	libgfxdr0
 %define lname_gf	libglusterfs0
-Version:        3.3.0
+Version:        3.3.1
 Release:        0
 Summary:        Aggregating distributed file system
 License:        GPL-2.0+ ; GPL-3.0
@@ -29,8 +32,8 @@ Url:            http://gluster.org/
 
 #Git-Clone:	git://github.com/gluster/glusterfs
 Source:         %name-%version.tar.xz
-Patch1:         glusterfs-init.diff
-Patch2:         glusterfs-date.diff
+Patch1:         glusterfs-date.diff
+Patch2:         glusterfs-init.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  bison
@@ -63,6 +66,14 @@ features and extensibility. It borrows a powerful concept called
 Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
 user space and easily manageable.
 
+%package -n %lname_api
+Summary:        GlusterFS WIP API library
+Group:          System/Libraries
+
+%description -n %lname_api
+GlusterFS is a clustered file-system capable of scaling to several
+petabytes.
+
 %package -n %lname_rpc
 Summary:        GlusterFS Remote Procedure Call library
 Group:          System/Libraries
@@ -90,6 +101,7 @@ petabytes.
 %package devel
 Summary:        Development files for glusterfs
 Group:          Development/Libraries/C and C++
+Requires:       %lname_api = %version
 Requires:       %lname_gf = %version
 Requires:       %lname_rpc = %version
 Requires:       %lname_xdr = %version
@@ -115,7 +127,8 @@ make %{?_smp_mflags};
 
 %install
 b="%buildroot";
-%make_install docdir=%_docdir/%name
+make install DESTDIR="$b" docdir="%_docdir/%name"
+find "$b/%_libdir" -type f -name "*.la" -delete;
 
 mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd};
 
@@ -164,16 +177,13 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 /sbin/ldconfig
 %insserv_cleanup
 
-%post -n %lname_rpc -p /sbin/ldconfig
-
+%post   -n %lname_api -p /sbin/ldconfig
+%postun -n %lname_api -p /sbin/ldconfig
+%post   -n %lname_rpc -p /sbin/ldconfig
 %postun -n %lname_rpc -p /sbin/ldconfig
-
-%post -n %lname_xdr -p /sbin/ldconfig
-
+%post   -n %lname_xdr -p /sbin/ldconfig
 %postun -n %lname_xdr -p /sbin/ldconfig
-
-%post -n %lname_gf -p /sbin/ldconfig
-
+%post   -n %lname_gf -p /sbin/ldconfig
 %postun -n %lname_gf -p /sbin/ldconfig
 
 %files
@@ -186,11 +196,17 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 %_libexecdir/%name
 %_libdir/%name
 %_sbindir/gluster*
-#%_mandir/man*/*
+%_mandir/man*/*
 %_docdir/%name
 %_localstatedir/lib/glusterd
 %_localstatedir/log/%name
 
+%if %master
+%files -n %lname_api
+%defattr(-,root,root)
+%_libdir/libgfapi.so.0*
+%endif
+
 %files -n %lname_rpc
 %defattr(-,root,root)
 %_libdir/libgfrpc.so.0*
@@ -207,5 +223,8 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
 %defattr(-,root,root)
 %_includedir/%name
 %_libdir/*.so
+%if %master
+%_libdir/pkgconfig/*.pc
+%endif
 
 %changelog