Merge remote-tracking branch 'origin/master' into f18
This commit is contained in:
Kaleb S. KEITHLEY
commit
fc7f33b116
@ -4,7 +4,7 @@
|
||||
%global _for_fedora_koji_builds 1
|
||||
|
||||
# uncomment and add '%' to use the prereltag for pre-releases
|
||||
%global prereltag beta2
|
||||
%global prereltag beta3
|
||||
|
||||
# if you wish to compile an rpm without rdma support, compile like this...
|
||||
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
|
||||
@ -55,13 +55,13 @@ Summary: Cluster File System
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Name: glusterfs
|
||||
Version: 3.4.0
|
||||
Release: 0.5%{?prereltag:.%{prereltag}}%{?dist}
|
||||
Release: 0.6%{?prereltag:.%{prereltag}}%{?dist}
|
||||
%else
|
||||
Name: @PACKAGE_NAME@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Release: 1%{?dist}
|
||||
%endif
|
||||
License: GPLv3+ and (GPLv2 or LGPLv3+)
|
||||
License: GPLv2 or LGPLv3+
|
||||
Group: System Environment/Base
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Vendor: Red Hat
|
||||
@ -78,6 +78,7 @@ Source3: umount.glusterfs
|
||||
Source4: glusterfs-fuse.logrotate
|
||||
Source5: glusterd.logrotate
|
||||
Source6: glusterfsd.logrotate
|
||||
Source7: rhel5-load-fuse-modules
|
||||
Patch0: %{name}-3.2.5.configure.ac.patch
|
||||
Patch1: %{name}-3.3.0.libglusterfs.Makefile.patch
|
||||
Patch2: %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.patch
|
||||
@ -89,6 +90,10 @@ Source11: glusterfsd.service
|
||||
Source12: glusterd.init
|
||||
Source13: glusterfsd.init
|
||||
|
||||
%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
|
||||
# we don't build swift/ufo on rhel5
|
||||
# not including the sources is ugly, but we state our intentions clearly
|
||||
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
Source15: http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{version}%{?prereltag}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
|
||||
%else
|
||||
@ -141,6 +146,8 @@ Source73: proxy-server.conf
|
||||
Source74: swift.conf
|
||||
Source75: object-expirer.conf
|
||||
|
||||
%endif
|
||||
|
||||
Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
|
||||
Patch21: 0002-Add-fixes-for-building-the-doc-package.patch
|
||||
Patch22: glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch
|
||||
@ -194,11 +201,11 @@ BuildRequires: gcc make automake libtool
|
||||
BuildRequires: ncurses-devel readline-devel
|
||||
BuildRequires: libxml2-devel openssl-devel
|
||||
BuildRequires: libaio-devel
|
||||
#BuildRequires: systemtap-sdt-devel lvm2-devel # glusterfs-3.4.x
|
||||
%if ( 0%{?suse_version} )
|
||||
BuildRequires: systemtap-sdt-devel
|
||||
BuildRequires: python-devel
|
||||
%else
|
||||
BuildRequires: python-ctypes
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
BuildRequires: lvm2-devel
|
||||
%endif
|
||||
|
||||
Obsoletes: hekafs <= 0.7
|
||||
@ -215,7 +222,7 @@ Provides: %{name}-core = %{version}-%{release}
|
||||
# - all provides from xlators and private libraries not in the ldconfig path
|
||||
#
|
||||
# TODO: RHEL5 does not have a convenient solution
|
||||
%if 0%{?rhel} == 6
|
||||
%if ( 0%{?rhel} == 6 )
|
||||
# filter_setup exists in RHEL6 only
|
||||
%filter_provides_in %{_libdir}/glusterfs/%{version}/
|
||||
%global __filter_from_req %{?__filter_from_req} | %{__grep} -v -P '^(?!lib).*\.so.*$'
|
||||
@ -284,9 +291,6 @@ Group: Applications/File
|
||||
BuildRequires: fuse-devel
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if ( ! 0%{?_without_fusermount} )
|
||||
Requires: /usr/bin/fusermount
|
||||
%endif
|
||||
|
||||
Obsoletes: %{name}-client < %{version}-%{release}
|
||||
Provides: %{name}-client = %{version}-%{release}
|
||||
@ -346,7 +350,10 @@ This package provides the glusterfs libgfapi library
|
||||
%package resource-agents
|
||||
Summary: OCF Resource Agents for GlusterFS
|
||||
License: GPLv3+
|
||||
%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
|
||||
# EL5 does not support noarch sub-packages
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
# this Group handling comes from the Fedora resource-agents package
|
||||
%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} )
|
||||
Group: System Environment/Base
|
||||
@ -583,13 +590,6 @@ storage costs.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?prereltag}
|
||||
%if ( 0%{?_with_ufo:1} )
|
||||
%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
|
||||
# unpack swift-1.x.y
|
||||
%setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 20
|
||||
%endif
|
||||
# unpack gluster ufo
|
||||
%setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 15
|
||||
%if ( 0%{_for_fedora_koji_builds} )
|
||||
#%patch0 -p0
|
||||
%patch1 -p0 -F4
|
||||
@ -597,6 +597,13 @@ storage costs.
|
||||
%patch2 -p1
|
||||
%endif
|
||||
%endif
|
||||
%if ( 0%{?_with_ufo:1} )
|
||||
%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
|
||||
# unpack swift-1.x.y
|
||||
%setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 20
|
||||
%endif
|
||||
# unpack gluster ufo
|
||||
%setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 15
|
||||
%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
|
||||
cd swift-%{SWIFTVER}
|
||||
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
|
||||
@ -678,6 +685,11 @@ cd ..
|
||||
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/glusterd
|
||||
%endif
|
||||
|
||||
%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
|
||||
%{__install} -D -p -m 0755 %{SOURCE7} \
|
||||
%{buildroot}%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules
|
||||
%endif
|
||||
|
||||
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterd
|
||||
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfs
|
||||
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfsd
|
||||
@ -932,6 +944,9 @@ fi
|
||||
%if ( 0%{?_without_fusermount:1} )
|
||||
%{_bindir}/fusermount-glusterfs
|
||||
%endif
|
||||
%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
|
||||
%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules
|
||||
%endif
|
||||
|
||||
%files server
|
||||
%defattr(-,root,root,-)
|
||||
@ -1420,6 +1435,17 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 11 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.6.beta3
|
||||
- prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19
|
||||
|
||||
* Wed May 29 2013 Niels de Vos <devos@fedoraproject.org>
|
||||
- automatically load the fuse module on EL5
|
||||
- there is no need to require the unused /usr/bin/fusermount
|
||||
- fix building on EL5
|
||||
|
||||
* Mon May 27 2013 Niels de Vos <devos@fedoraproject.org>
|
||||
- include glusterfs-api.pc in the -devel subpackage
|
||||
|
||||
* Fri May 24 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.5.beta2
|
||||
- prerelease 3.4.0beta2 for oVirt/vdsm dependencies in Fedora19
|
||||
|
||||
|
||||
7
rhel5-load-fuse-modules
Executable file
7
rhel5-load-fuse-modules
Executable file
@ -0,0 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# fusermount-glusterfs requires the /dev/fuse character device. The fuse module
|
||||
# provides this and is loaded on demand in newer Linux distributions.
|
||||
#
|
||||
|
||||
[ -c /dev/fuse ] || /sbin/modprobe fuse
|
||||
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
2b213d50508f9838d5b897e8be3614c0 glusterfs-3.4.0beta2.tar.gz
|
||||
95c6c75b09ecc2aab8db1dce1b3ff26c glusterfs-3.4.0beta3.tar.gz
|
||||
0d2479c3cbb124fa3a6b001d0d4d5a8b swift-1.8.0.tar.gz
|
||||
7a2e11fd7b59d4ddee2c699adf60fc6e gluster-swift-ufo-1.2beta2.tar.gz
|
||||
a48cbca2e9bf4c0a8e44a8a08707f3a4 gluster-swift-ufo-1.2beta3.tar.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user