diff --git a/.cvsignore b/.cvsignore
index 93f9195..16ea1df 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glusterfs-1.3.12.tar.gz
+glusterfs-2.0.6.tar.gz
diff --git a/glusterfs.spec b/glusterfs.spec
index 432fe08..ee01178 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,11 +1,10 @@
+#define pre rc8
+
# Possible rpmbuild options
%{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
%{?_without_client:%define _without_client --disable-fuse-client}
%{?_without_python:%define _without_python --disable-python}
-# Default to disabling client on RHEL, but allow forcing --with client too
-%{?rhel:%{!?_with_client:%define _without_client --disable-fuse-client}}
-
# Disable the python bindings if we have < 2.4, since 2.4+ is required
%if "%(%{__python} -c "import sys ; print sys.version[:3]")" < "2.4"
%define _without_python --disable-python
@@ -13,15 +12,17 @@
Summary: Cluster File System
Name: glusterfs
-Version: 1.3.12
-Release: 2%{?dist}
+Version: 2.0.6
+Release: 1%{?pre:.%{pre}}%{?dist}
License: GPLv3+
Group: System Environment/Base
-URL: http://www.gluster.org/docs/index.php/GlusterFS
-Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/1.3/glusterfs-%{version}.tar.gz
+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
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
@@ -41,12 +42,13 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS
is in userspace and easily manageable.
-%package libs
-Summary: GlusterFS Library and Translators
+%package common
+Summary: GlusterFS common files for both the client and the server
Group: System Environment/Libraries
-Obsoletes: glusterfs-common <= 1.3.7-2
+Obsoletes: glusterfs-libs < 2.0.0
+Provides: glusterfs-libs = %{version}-%{release}
-%description libs
+%description common
GlusterFS is a clustered file-system capable of scaling to several
peta-bytes. It aggregates various storage bricks over Infiniband RDMA
or TCP/IP interconnect into one large parallel network file
@@ -55,15 +57,15 @@ terms of features and extensibility. It borrows a powerful concept
called Translators from GNU Hurd kernel. Much of the code in GlusterFS
is in userspace and easily manageable.
-This package includes libglusterfs and glusterfs translator modules
-common to both GlusterFS server and client framework.
+This package includes the glusterfs binary, libglusterfs and glusterfs
+translator modules common to both GlusterFS server and client framework.
%package client
Summary: GlusterFS Client
Group: Applications/File
Requires: fuse
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description client
GlusterFS is a clustered file-system capable of scaling to several
@@ -80,7 +82,7 @@ This package provides the FUSE based GlusterFS client.
%package server
Summary: GlusterFS Server
Group: System Environment/Daemons
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description server
GlusterFS is a clustered file-system capable of scaling to several
@@ -97,7 +99,7 @@ This package provides the glusterfs server daemon.
%package devel
Summary: GlusterFS Development Libraries
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description devel
GlusterFS is a clustered file-system capable of scaling to several
@@ -112,11 +114,18 @@ This package provides the development libraries.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?pre}
+# Remove file, it gets re-generated by bison (was causing koji build failures)
+rm -f libglusterfs/src/y.tab.c
+# Don't get executable sources in the debuginfo package (as of 2.0.0rc7)
+chmod -x libglusterfsclient/src/*.{c,h}
%build
%configure %{?_without_ibverbs} %{?_without_client} %{?_without_python}
+# Remove rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{__make} %{?_smp_mflags}
@@ -128,6 +137,9 @@ This package provides the development libraries.
%{__install} -p -m 0644 libglusterfs/src/*.h \
%{buildroot}%{_includedir}/glusterfs/
+# Remove unwanted files from all of the shared libraries
+find %{buildroot}%{_libdir}/glusterfs -name '*.a' -o -name '*.la' | xargs rm -f
+
# Remove installed docs, we include them ourselves as %%doc
%{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
@@ -150,16 +162,23 @@ done
# Install wrapper umount script
%{__install} -D -p -m 0755 %{SOURCE3} \
%{buildroot}/sbin/umount.glusterfs
+# Client logrotate entry
+%{__install} -D -p -m 0644 %{SOURCE4} \
+ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
%endif
+# Server logrotate entry
+%{__install} -D -p -m 0644 %{SOURCE5} \
+ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
+
%clean
%{__rm} -rf %{buildroot}
-%post libs -p /sbin/ldconfig
+%post common -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%postun common -p /sbin/ldconfig
%post server
@@ -171,51 +190,87 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del glusterfsd
fi
-%postun
+%postun server
if [ $1 -ge 1 ]; then
/sbin/service glusterfsd condrestart &>/dev/null || :
fi
-%files libs
+%files common
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/glusterfs/
%{_libdir}/*.so.*
+%{_sbindir}/glusterfs
+%{_sbindir}/glusterfsd
+%{_mandir}/man8/glusterfs.8*
+%dir /var/log/glusterfs/
%if 0%{!?_without_client:1}
%files client
-%{_sbindir}/glusterfs
+%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
/sbin/mount.glusterfs
/sbin/umount.glusterfs
-%dir /var/log/glusterfs/
-%{_mandir}/man8/glusterfs.8*
%endif
%files server
-%doc examples/ doc/glusterfs-*.vol.sample
+%doc examples/ doc/glusterfs*.vol.sample
%dir %{_sysconfdir}/glusterfs/
%config(noreplace) %{_sysconfdir}/glusterfs/*.vol
+%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
%{_sysconfdir}/init.d/glusterfsd
-%{_sbindir}/glusterfs
-%{_sbindir}/glusterfsd
-%dir /var/log/glusterfs/
-%{_mandir}/man8/glusterfs.8*
%files devel
%{_includedir}/glusterfs/
+%{_includedir}/libglusterfsclient.h
%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la
%{_libdir}/*.so
%changelog
-* Sun Apr 12 2009 Matthias Saou 1.3.12-2
-- Fix the common sub-package's obsoletes of libs. A simple typo which might
- cause major problems...
+* 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).
+- Update spec file URLs.
+
+* Mon Jul 27 2009 Matthias Saou 2.0.4-1
+- Update to 2.0.4.
+
+* Thu Jun 11 2009 Matthias Saou 2.0.1-2
+- Remove libglusterfs/src/y.tab.c to fix koji F11/devel builds.
+
+* Sat May 16 2009 Matthias Saou 2.0.1-1
+- Update to 2.0.1.
+
+* Thu May 7 2009 Matthias Saou 2.0.0-1
+- Update to 2.0.0 final.
+
+* Wed Apr 29 2009 Matthias Saou 2.0.0-0.3.rc8
+- Move glusterfsd to common, since the client has a symlink to it.
+
+* Fri Apr 24 2009 Matthias Saou 2.0.0-0.2.rc8
+- Update to 2.0.0rc8.
+
+* Sun Apr 12 2009 Matthias Saou 2.0.0-0.2.rc7
+- Update glusterfsd init script to the new style init.
+- Update files to match the new default vol file names.
+- Include logrotate for glusterfsd, use a pid file by default.
+- Include logrotate for glusterfs, using killall for lack of anything better.
+
+* Sat Apr 11 2009 Matthias Saou 2.0.0-0.1.rc7
+- Update to 2.0.0rc7.
+- Rename "libs" to "common" and move the binary, man page and log dir there.
+
+* Tue Feb 24 2009 Fedora Release Engineering
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 16 2009 Matthias Saou 2.0.0-0.1.rc1
+- Update to 2.0.0rc1.
+- Include new libglusterfsclient.h.
* Mon Feb 16 2009 Matthias Saou 1.3.12-1
- Update to 1.3.12.
diff --git a/sources b/sources
index da2dcdc..3fb24c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db11e3d9d227f5b10b2a93c0d8929123 glusterfs-1.3.12.tar.gz
+dfa42bfc34d799888a1e3032f9143c72 glusterfs-2.0.6.tar.gz