Use %bcond_with and %bcond_without instead of commenting out lines

This looks more like the upstream generated spec file and helps in
comparing the differences between the two.

Only style changes, the functionality and sub-packages are still the
same. There is no need to do a build for this, or increase the release.
This commit is contained in:
Niels de Vos 2015-05-27 16:06:45 +02:00
parent b99a652a4c
commit 3a6ad03c1d
1 changed files with 19 additions and 16 deletions

View File

@ -26,8 +26,8 @@
# %%bcond_with means you add a "--with" option, default = without this feature
# %%bcond_without adds a"--without" so the feature is enabled by default
#%%bcond_without gpfs
%global use_fsal_gpfs OFF
%bcond_with gpfs
%global use_fsal_gpfs %{on_off_switch gpfs}
%bcond_without xfs
%global use_fsal_xfs %{on_off_switch xfs}
@ -35,34 +35,34 @@
%bcond_without ceph
%global use_fsal_ceph %{on_off_switch ceph}
#%%bcond_with lustre
%global use_fsal_lustre OFF
%bcond_with lustre
%global use_fsal_lustre %{on_off_switch lustre}
#%%bcond_with shook
%global use_fsal_shook OFF
%bcond_with shook
%global use_fsal_shook %{on_off_switch shook}
%bcond_without gluster
%global use_fsal_gluster %{on_off_switch gluster}
#%%bcond_with hpss
%global use_fsal_hpss OFF
%bcond_with hpss
%global use_fsal_hpss %{on_off_switch hpss}
#%%bcond_without panfs
%global use_fsal_panfs OFF
%bcond_with panfs
%global use_fsal_panfs %{on_off_switch panfs}
#%%bcond_with pt
%global use_fsal_pt OFF
%bcond_with pt
%global use_fsal_pt %{on_off_switch pt}
%bcond_with rdma
%global use_rdma %{on_off_switch rdma}
%bcond_without jemalloc
#%%bcond_with lustre_up
%global use_lustre_up OFF
%bcond_with lustre_up
%global use_lustre_up %{on_off_switch lustre_up}
#%%bcond_with lttng
%global use_lttng OFF
%bcond_with lttng
%global use_lttng %{on_off_switch lttng}
%bcond_without utils
%global use_utils %{on_off_switch utils}
@ -564,6 +564,9 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
%endif
%changelog
* Wed May 27 2015 Niels de Vos <ndevos@redhat.com>
- improve readability and allow "rpmbuild --with .." options again
* Fri May 15 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-2
- %license, build with glusterfs-3.7.0 GA