1
0
forked from pool/glusterfs

Accepting request 144067 from filesystems

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/144067
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=6
This commit is contained in:
Ismail Dönmez 2012-12-07 13:09:27 +00:00 committed by Git OBS Bridge
commit 4adf1b69d0
6 changed files with 82 additions and 64 deletions

8
glusterd.service Normal file
View File

@ -0,0 +1,8 @@
[Unit]
Description=Gluster elastic volume management daemon
[Service]
ExecStart=/usr/sbin/glusterd
[Install]
WantedBy=multi-user.target

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59f1ae0b1c3ef97768b0b740b7f0146aedd0102d19c19e50fb04ae5990126066
size 1541028

View File

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

View File

@ -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

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Nov 27 10:59:15 UTC 2012 - cfarrell@suse.com
- license update: GPL-2.0 or LGPL-3.0+
-------------------------------------------------------------------
Fri Nov 9 21:47:11 UTC 2012 - jengelh@inai.de
- Update to new upstream release 3.4.0qa2
* No changelog provided by upstream
- Remove glusterfs-init.diff, merged upstream
- Provide systemd service file
-------------------------------------------------------------------
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

View File

@ -17,20 +17,22 @@
Name: glusterfs
%define lname_api libgfapi0
%define lname_rpc libgfrpc0
%define lname_xdr libgfxdr0
%define lname_gf libglusterfs0
Version: 3.3.0
Version: 3.4.0~qa2
Release: 0
%define rversion 3.4.0qa2
Summary: Aggregating distributed file system
License: GPL-2.0+ ; GPL-3.0
License: GPL-2.0 or LGPL-3.0+
Group: System/Filesystems
Url: http://gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs
Source: %name-%version.tar.xz
Patch1: glusterfs-init.diff
Patch2: glusterfs-date.diff
Source: %name-%rversion.tar.xz
Source3: glusterd.service
Patch1: glusterfs-date.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
BuildRequires: bison
@ -52,6 +54,9 @@ BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(uuid)
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
%endif
Requires: python
%description
@ -63,6 +68,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 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 +103,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
@ -103,8 +117,8 @@ This package provides development files such as headers and library
links.
%prep
%setup -q
%patch -P 1 -P 2 -p1
%setup -qn %name-%rversion
%patch -P 1 -p1
%build
./autogen.sh;
@ -115,7 +129,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};
@ -150,30 +165,32 @@ find "$b/%_libdir" -maxdepth 1 -type f -name "*.la" -delete;
# W: wrong-file-end-of-line-encoding
perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
%if 0%{?_unitdir:1}
mkdir -p "$b/%_unitdir";
install -pm0644 "%{S:3}" "$b/%_unitdir/";
%endif
%fdupes %buildroot
%pre
%service_add_pre glusterd.service
%post
/sbin/ldconfig
%insserv_cleanup
%restart_on_update glusterd
%service_add_post glusterd.service
%preun
%stop_on_removal glusterd
%service_del_preun glusterd.service
%postun
/sbin/ldconfig
%insserv_cleanup
%service_del_postun glusterd.service
%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
%postun -n %lname_xdr -p /sbin/ldconfig
%post -n %lname_gf -p /sbin/ldconfig
%postun -n %lname_gf -p /sbin/ldconfig
%files
@ -181,15 +198,23 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
%_initrddir/glusterd
%dir %_sysconfdir/%name
%config(noreplace) %_sysconfdir/%name/glusterd.vol
%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
#%config %_sysconfdir/%name/*.sample
/sbin/mount.%name
%_libexecdir/%name
%_libdir/%name
%_sbindir/gluster*
#%_mandir/man*/*
%_mandir/man*/*
%_docdir/%name
%_localstatedir/lib/glusterd
%_localstatedir/log/%name
%if 0%{?_unitdir:1}
%_unitdir/glusterd.service
%endif
%files -n %lname_api
%defattr(-,root,root)
%_libdir/libgfapi.so.0*
%files -n %lname_rpc
%defattr(-,root,root)
@ -207,5 +232,6 @@ perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
%defattr(-,root,root)
%_includedir/%name
%_libdir/*.so
%_libdir/pkgconfig/*.pc
%changelog