Update to 2.0.7. Add glusterfs-volgen. Add more documentation.

This commit is contained in:
Jonathan Steffan 2009-10-31 21:00:57 +00:00
parent 1f188f95aa
commit 31784c8d46
4 changed files with 55 additions and 33 deletions

View File

@ -1 +1 @@
glusterfs-2.0.6.tar.gz
glusterfs-2.0.7.tar.gz

View File

@ -1,4 +1,11 @@
#define pre rc8
## NOTE: Lots of files in various subdirectories have the same name (such as
## "LICENSE") so this short macro allows us to distinguish them by using their
## directory names (from the source tree) as prefixes for the files.
## Usage: add_to_doc_files subdirname files
%define add_to_doc_files() \
%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}/%1 ||: ; \
%{__cp} -p %2 %{buildroot}%{_docdir}/%{name}-%{version}/%1
# Possible rpmbuild options
%{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
@ -10,27 +17,27 @@
%define _without_python --disable-python
%endif
Summary: Cluster File System
Name: glusterfs
Version: 2.0.6
Release: 2%{?pre:.%{pre}}%{?dist}
License: GPLv3+
Group: System Environment/Base
URL: http://www.gluster.org/
Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
Source1: glusterfsd.init
Source2: glusterfsd.sysconfig
Source3: umount.glusterfs
Source4: glusterfs.logrotate
Source5: glusterfsd.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Summary: Cluster File System
Name: glusterfs
Version: 2.0.7
Release: 1%{?pre:.%{pre}}%{?dist}
License: GPLv3+
Group: System Environment/Base
URL: http://www.gluster.org/
Source0: http://ftp.gluster.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz
Source1: glusterfsd.init
Source2: glusterfsd.sysconfig
Source3: umount.glusterfs
Source4: glusterfs.logrotate
Source5: glusterfsd.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
%{!?_without_ibverbs:BuildRequires: libibverbs-devel}
%{!?_without_client:BuildRequires: fuse-devel}
%{!?_without_python:BuildRequires: python-devel}
BuildRequires: flex, bison, byacc
BuildRequires: flex, bison, byacc
%description
GlusterFS is a clustered file-system capable of scaling to several
@ -43,10 +50,10 @@ is in userspace and easily manageable.
%package common
Summary: GlusterFS common files for both the client and the server
Group: System Environment/Libraries
Obsoletes: glusterfs-libs < 2.0.0
Provides: glusterfs-libs = %{version}-%{release}
Summary: GlusterFS common files for both the client and the server
Group: System Environment/Libraries
Obsoletes: glusterfs-libs < 2.0.0
Provides: glusterfs-libs = %{version}-%{release}
%description common
GlusterFS is a clustered file-system capable of scaling to several
@ -62,10 +69,10 @@ translator modules common to both GlusterFS server and client framework.
%package client
Summary: GlusterFS Client
Group: Applications/File
Requires: fuse
Requires: %{name}-common = %{version}-%{release}
Summary: GlusterFS Client
Group: Applications/File
Requires: fuse
Requires: %{name}-common = %{version}-%{release}
%description client
GlusterFS is a clustered file-system capable of scaling to several
@ -80,9 +87,9 @@ This package provides the FUSE based GlusterFS client.
%package server
Summary: GlusterFS Server
Group: System Environment/Daemons
Requires: %{name}-common = %{version}-%{release}
Summary: GlusterFS Server
Group: System Environment/Daemons
Requires: %{name}-common = %{version}-%{release}
%description server
GlusterFS is a clustered file-system capable of scaling to several
@ -95,11 +102,10 @@ is in userspace and easily manageable.
This package provides the glusterfs server daemon.
%package devel
Summary: GlusterFS Development Libraries
Group: Development/Libraries
Requires: %{name}-common = %{version}-%{release}
Summary: GlusterFS Development Libraries
Group: Development/Libraries
Requires: %{name}-common = %{version}-%{release}
%description devel
GlusterFS is a clustered file-system capable of scaling to several
@ -171,6 +177,13 @@ done
%{__install} -D -p -m 0644 %{SOURCE5} \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
# Install volgen tool
%{__install} -D -p -m 0755 extras/glusterfs-volgen.py \
%{buildroot}%{_bindir}/glusterfs-volgen
# Install extra documentation
%add_to_doc_files benchmarking extras/benchmarking/{*.c,README,*.sh}
%clean
%{__rm} -rf %{buildroot}
@ -197,11 +210,13 @@ fi
%files common
%doc AUTHORS ChangeLog COPYING NEWS README
%doc AUTHORS ChangeLog COPYING NEWS README extras/{glusterfs-mode.el,glusterfs.vim}
%{_docdir}/%{name}-%{version}/benchmarking
%{_libdir}/glusterfs/
%{_libdir}/*.so.*
%{_sbindir}/glusterfs
%{_sbindir}/glusterfsd
%{_bindir}/glusterfs-volgen
%{_mandir}/man8/glusterfs.8*
%dir /var/log/glusterfs/
@ -232,6 +247,12 @@ fi
%changelog
* Sat Oct 31 2009 Jonathan Steffan <jsteffan@fedoraproject.org> - 2.0.7-1
- Update to 2.0.7
- Install glusterfs-volgen, until it's properly added to automake
by upstream
- Add macro to be able to ship more docs
* Thu Sep 17 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.6-2
- Rebuilt with new fuse

1
import.log Normal file
View File

@ -0,0 +1 @@
glusterfs-2_0_7-1_fc11:HEAD:glusterfs-2.0.7-1.fc11.src.rpm:1257022756

View File

@ -1 +1 @@
dfa42bfc34d799888a1e3032f9143c72 glusterfs-2.0.6.tar.gz
ed8968a8671fecd7f7eec7c746c8608c glusterfs-2.0.7.tar.gz