diff --git a/glusterfs.spec b/glusterfs.spec index eabe34d..f6c5251 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -12,15 +12,10 @@ %{?_without_client:%define _without_client --disable-fuse-client} %{?_without_python:%define _without_python --disable-python} -# 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 -%endif - -Summary: Cluster File System +Summary: GlusterFS - Cluster File System Name: glusterfs Version: 2.0.9 -Release: 1%{?pre:.%{pre}}%{?dist} +Release: 2%{?pre:.%{pre}}%{?dist} License: GPLv3+ Group: System Environment/Base URL: http://www.gluster.org/ @@ -36,14 +31,14 @@ 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} +%{!?_without_python:BuildRequires: python-devel >= 2.4} BuildRequires: flex, bison, byacc %description 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 -system. GlusterFS is one of the most sophisticated file system in +system. GlusterFS is one of the most sophisticated file systems in 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. @@ -53,13 +48,13 @@ is in userspace and easily manageable. 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} +Provides: glusterfs-libs >= %{version}-%{release} %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 -system. GlusterFS is one of the most sophisticated file system in +system. GlusterFS is one of the most sophisticated file systems in 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. @@ -78,7 +73,7 @@ Requires: %{name}-common = %{version}-%{release} 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 -system. GlusterFS is one of the most sophisticated file system in +system. GlusterFS is one of the most sophisticated file systems in 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. @@ -95,7 +90,7 @@ Requires: %{name}-common = %{version}-%{release} 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 -system. GlusterFS is one of the most sophisticated file system in +system. GlusterFS is one of the most sophisticated file systems in 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. @@ -111,7 +106,7 @@ Requires: %{name}-common = %{version}-%{release} 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 -system. GlusterFS is one of the most sophisticated file system in +system. GlusterFS is one of the most sophisticated file systems in 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. @@ -128,10 +123,14 @@ chmod -x libglusterfsclient/src/*.{c,h} %build +# Temp disable stack-protector until upstream fixes code +CFLAGS=`echo "%optflags"|sed 's/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1/'` %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} @@ -212,7 +211,6 @@ fi %{_libdir}/*.so.* %{_sbindir}/glusterfs %{_sbindir}/glusterfsd -%{_bindir}/glusterfs-volgen %{_mandir}/man8/glusterfs.8* %dir /var/log/glusterfs/ @@ -238,12 +236,23 @@ fi %{_includedir}/glusterfs/ %{_includedir}/libglusterfsclient.h %{_datadir}/glusterfs/* +%{_bindir}/glusterfs-volgen %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %changelog +* Sat Apr 10 2010 Jonathan Steffan - 2.0.9-2 +- Move python version requires into a proper BuildRequires otherwise + the spec always turned off python bindings as python is not part + of buildsys-build and the chroot will never have python unless we + require it +- Temporarily set -D_FORTIFY_SOURCE=1 until upstream fixes code + GlusterFS Bugzilla #197 (#555728) +- Move glusterfs-volgen to devel subpackage (#555724) +- Update description (#554947) + * Sat Jan 2 2010 Jonathan Steffan - 2.0.9-1 - Update to 2.0.9 diff --git a/import.log b/import.log index db5f9e4..f3736e1 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ glusterfs-2_0_7-1_fc11:F-12:glusterfs-2.0.7-1.fc11.src.rpm:1257022867 glusterfs-2_0_8-1_fc11:F-12:glusterfs-2.0.8-1.fc11.src.rpm:1257712282 glusterfs-2_0_9-1_fc12:F-12:glusterfs-2.0.9-1.fc12.src.rpm:1262476367 +glusterfs-2_0_9-2_fc12:F-12:glusterfs-2.0.9-2.fc12.src.rpm:1271017970