3.4.0-5, there is no systemtap/dtrace support; don't even pretend

This commit is contained in:
Kaleb S. KEITHLEY 2013-08-05 09:06:54 -04:00
parent 153626cc5f
commit a2d60d5f8d

View File

@ -31,18 +31,21 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf
%{?_without_ocf:%global _without_ocf --without-ocf} %{?_without_ocf:%global _without_ocf --without-ocf}
# there is no systemtap support! Perhaps some day there will be
%global _without_systemtap --enable-systemtap=no
# if you wish to compile an rpm without the BD map support... # if you wish to compile an rpm without the BD map support...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd
%{?_without_bd:%global _without_bd --disable-bd-xlator} %{?_without_bd:%global _without_bd --disable-bd-xlator}
# if you wish to build rpms without UFO, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without ufo
%{?_without_ufo:%global _without_ufo true}
%if ( 0%{?rhel} && 0%{?rhel} < 6 ) %if ( 0%{?rhel} && 0%{?rhel} < 6 )
%define _without_bd true %define _without_bd true
%endif %endif
# if you wish to build rpms without UFO, compile like this
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without ufo
%{?_without_ufo:%global _without_ufo true}
%if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
%global _with_systemd true %global _with_systemd true
%endif %endif
@ -63,7 +66,7 @@ Summary: Cluster File System
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs Name: glusterfs
Version: 3.4.0 Version: 3.4.0
Release: 4%{?prereltag:.%{prereltag}}%{?dist} Release: 5%{?prereltag:.%{prereltag}}%{?dist}
Vendor: Fedora Project Vendor: Fedora Project
%else %else
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
@ -204,14 +207,14 @@ BuildRequires: gcc make automake libtool
BuildRequires: ncurses-devel readline-devel BuildRequires: ncurses-devel readline-devel
BuildRequires: libxml2-devel openssl-devel BuildRequires: libxml2-devel openssl-devel
BuildRequires: libaio-devel BuildRequires: libaio-devel
BuildRequires: systemtap-sdt-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-ctypes BuildRequires: python-ctypes
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) %if ( 0%{!?_without_systemtap:1} )
BuildRequires: systemtap-sdt-devel
%endif
%if ( 0%{!?_without_bd:1} ) %if ( 0%{!?_without_bd:1} )
BuildRequires: lvm2-devel BuildRequires: lvm2-devel
%endif %endif
%endif
Obsoletes: hekafs <= 0.7 Obsoletes: hekafs <= 0.7
Obsoletes: %{name}-libs <= 2.0.0 Obsoletes: %{name}-libs <= 2.0.0
@ -650,7 +653,7 @@ cd ../ufo
%build %build
./autogen.sh ./autogen.sh
%configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication} %{?_without_ocf} %{?_without_bd} %configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication} %{?_without_ocf} %{?_without_bd} %{?_without_systemtap}
# fix hardening and remove rpath in shlibs # fix hardening and remove rpath in shlibs
%if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) %if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
@ -1476,6 +1479,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Aug 5 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-5
- there is no systemtap/dtrace support; don't even pretend
* Fri Aug 2 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-4 * Fri Aug 2 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-4
- sync changes from upstream glusterfs.spec.in, including addition of - sync changes from upstream glusterfs.spec.in, including addition of
glusterfs-libs RPM to simplify dependencies for qemu-kvm glusterfs-libs RPM to simplify dependencies for qemu-kvm