diff --git a/.cvsignore b/.cvsignore index 16ea1df..156fde5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glusterfs-2.0.6.tar.gz +glusterfs-2.0.7.tar.gz diff --git a/glusterfs.spec b/glusterfs.spec index ee01178..2a104e9 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -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: 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 +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,15 @@ fi %changelog +* Sat Oct 31 2009 Jonathan Steffan - 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 2.0.6-2 +- Rebuilt with new fuse + * Sat Sep 12 2009 Matthias Saou 2.0.6-1 - Update to 2.0.6. - No longer default to disable the client on RHEL5 (#522192). diff --git a/import.log b/import.log new file mode 100644 index 0000000..c1f8d95 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +glusterfs-2_0_7-1_fc11:EL-5:glusterfs-2.0.7-1.fc11.src.rpm:1257023935 diff --git a/sources b/sources index 3fb24c9..c4e9ffc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfa42bfc34d799888a1e3032f9143c72 glusterfs-2.0.6.tar.gz +ed8968a8671fecd7f7eec7c746c8608c glusterfs-2.0.7.tar.gz diff --git a/umount.glusterfs b/umount.glusterfs index 6c179a3..9aefa5f 100644 --- a/umount.glusterfs +++ b/umount.glusterfs @@ -1,20 +1,4 @@ #!/bin/sh -# (C) 2008 Gluster core team -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301 USA umount "$1"