contrib/rpm: (trivial) move some %files around, remove a duplicate

Just a cosmetic thing.
This commit is contained in:
Lubomir Rintel
2018-11-29 18:00:39 +01:00
parent 35a428f168
commit c4f1fac35d

View File

@@ -824,13 +824,15 @@ fi
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_bindir}/nmcli %{_bindir}/nmcli
%{_datadir}/bash-completion/completions/nmcli %{_datadir}/bash-completion/completions/nmcli
%dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/conf.d
%dir %{_sysconfdir}/%{name}/dispatcher.d %dir %{_sysconfdir}/%{name}/dispatcher.d
%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d %dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d
%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d %dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d
%dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d %dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d
%dir %{_sysconfdir}/%{name}/dnsmasq.d %dir %{_sysconfdir}/%{name}/dnsmasq.d
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d %dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
%dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
%{_bindir}/nm-online %{_bindir}/nm-online
%{_libexecdir}/nm-ifup %{_libexecdir}/nm-ifup
@@ -847,8 +849,6 @@ fi
%if %{with nmtui} %if %{with nmtui}
%exclude %{_mandir}/man1/nmtui* %exclude %{_mandir}/man1/nmtui*
%endif %endif
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/conf.d
%dir %{nmlibdir} %dir %{nmlibdir}
%dir %{nmlibdir}/conf.d %dir %{nmlibdir}/conf.d
%dir %{nmlibdir}/VPN %dir %{nmlibdir}/VPN
@@ -857,7 +857,6 @@ fi
%{_mandir}/man7/nmcli-examples.7* %{_mandir}/man7/nmcli-examples.7*
%{_mandir}/man8/* %{_mandir}/man8/*
%dir %{_localstatedir}/lib/NetworkManager %dir %{_localstatedir}/lib/NetworkManager
%dir %{_sysconfdir}/NetworkManager/system-connections
%dir %{_sysconfdir}/sysconfig/network-scripts %dir %{_sysconfdir}/sysconfig/network-scripts
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_datadir}/polkit-1/actions/*.policy %{_datadir}/polkit-1/actions/*.policy