diff --git a/.cvsignore b/.cvsignore index 93f9195..77c7abe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -glusterfs-1.3.12.tar.gz +glusterfs-2.0.0rc7.tar.gz diff --git a/glusterfs.spec b/glusterfs.spec index f58c1bf..f517363 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,3 +1,5 @@ +%define pre rc7 + # Possible rpmbuild options %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs} %{?_without_client:%define _without_client --disable-fuse-client} @@ -13,12 +15,12 @@ Summary: Cluster File System Name: glusterfs -Version: 1.3.12 -Release: 2%{?dist} +Version: 2.0.0 +Release: 0.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 +Source0: http://ftp.zresearch.com/pub/gluster/glusterfs/2.0/%{version}/glusterfs-%{version}%{?pre}.tar.gz Source1: glusterfsd.init Source2: glusterfsd.sysconfig Source3: umount.glusterfs @@ -41,12 +43,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 +58,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 +83,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 +100,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 +115,16 @@ This package provides the development libraries. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?pre} +# 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 +136,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/ @@ -157,9 +168,9 @@ done %{__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 @@ -177,45 +188,51 @@ if [ $1 -ge 1 ]; then fi -%files libs +%files common %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/glusterfs/ %{_libdir}/*.so.* +%{_sbindir}/glusterfs +%{_mandir}/man8/glusterfs.8* +%dir /var/log/glusterfs/ %if 0%{!?_without_client:1} %files client -%{_sbindir}/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}/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 -* Tue Feb 24 2009 Fedora Release Engineering - 1.3.12-2 +* 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. - Remove no longer needed ocreat patch. diff --git a/sources b/sources index da2dcdc..82b6d95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db11e3d9d227f5b10b2a93c0d8929123 glusterfs-1.3.12.tar.gz +5bf45dcb8a3ad14042fcf2c2dd25e125 glusterfs-2.0.0rc7.tar.gz