diff --git a/glusterfs.spec b/glusterfs.spec index 010f6c1..d5fcf6d 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -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 @@ -201,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 @@ -222,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.*$' @@ -590,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 @@ -604,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 ) @@ -685,7 +685,7 @@ cd .. %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/glusterd %endif -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) %{__install} -D -p -m 0755 %{SOURCE7} \ %{buildroot}%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules %endif @@ -944,7 +944,7 @@ fi %if ( 0%{?_without_fusermount:1} ) %{_bindir}/fusermount-glusterfs %endif -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) %{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules %endif @@ -1025,7 +1025,6 @@ fi %files devel %defattr(-,root,root,-) %{_includedir}/glusterfs -%{_libdir}/pkgconfig/glusterfs-api.pc %exclude %{_includedir}/glusterfs/y.tab.h %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so @@ -1436,6 +1435,9 @@ fi %endif %changelog +* Tue Jun 11 2013 Kaleb S. KEITHLEY - 3.4.0-0.6.beta3 +- prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19 + * Wed May 29 2013 Niels de Vos - automatically load the fuse module on EL5 - there is no need to require the unused /usr/bin/fusermount diff --git a/sources b/sources index ace4a4c..bc372be 100644 --- a/sources +++ b/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