contrib/rpm: reorder spec file and move bcond definitions together

This commit is contained in:
Thomas Haller 2017-03-06 20:22:28 +01:00
parent 560801e237
commit e72b43e01f

View file

@ -43,15 +43,6 @@
###############################################################################
%bcond_without adsl
%if 0%{?fedora}
%global dbus_version 1.9.18
%global dbus_sys_dir %{_datadir}/dbus-1/system.d
%else
%global dbus_version 1.1
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
%endif
%bcond_without bluetooth
%bcond_without wwan
%bcond_without team
@ -64,6 +55,14 @@
###############################################################################
%if 0%{?fedora}
%global dbus_version 1.9.18
%global dbus_sys_dir %{_datadir}/dbus-1/system.d
%else
%global dbus_version 1.1
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
%endif
%if %{with bluetooth} || %{with wwan}
%global with_modem_manager_1 1
%else