diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-06 20:22:28 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-06 20:23:15 +0100 |
| commit | e72b43e01fd2792cfa6470dc0984e2c89e8b2bb1 (patch) | |
| tree | f11e94b902828146f0b9c60be1ecf1bb5232aae5 | |
| parent | 560801e237c9fffe558396f85ed4ab75cfb9e4b7 (diff) | |
| download | NetworkManager-e72b43e01fd2792cfa6470dc0984e2c89e8b2bb1.tar.gz | |
contrib/rpm: reorder spec file and move bcond definitions together
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 2b7250fc59..7e02cdac58 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -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 |