diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2018-07-10 08:47:31 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-07-23 12:30:20 +0200 |
commit | 3f449654f73b58d920f512dc223304bc28f2a4d9 (patch) | |
tree | 05138f501d3adea602c46208a90952b4e9a1406b | |
parent | 91235ec2ba26fefc3d790834f1f2a2c05ebbad1e (diff) | |
download | NetworkManager-3f449654f73b58d920f512dc223304bc28f2a4d9.tar.gz |
contrib/rpm: use whitespace consistently
Double newline is used to visually separate sections.
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index b44766b8cb..a1a7640065 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -384,6 +384,7 @@ This adds a NetworkManager configuration file to enable connectivity checking via Fedora infrastructure. %endif + %package config-server Summary: NetworkManager config file for "server-like" defaults Group: System Environment/Base @@ -399,6 +400,7 @@ ethernet devices with no carrier. This package is intended to be installed by default for server deployments. + %package dispatcher-routing-rules Summary: NetworkManager dispatcher file for advanced routing rules Group: System Environment/Base @@ -411,6 +413,7 @@ This adds a NetworkManager dispatcher file to support networking configurations using "/etc/sysconfig/network-scripts/rule-NAME" files (eg, to do policy-based routing). + %if 0%{with_nmtui} %package tui Summary: NetworkManager curses-based UI @@ -424,11 +427,13 @@ NetworkManager, to allow performing some of the operations supported by nm-connection-editor and nm-applet in a non-graphical environment. %endif + %prep %setup -q -n NetworkManager-%{real_version} #%patch1 -p1 + %build %if %{with regen_docs} gtkdocize @@ -542,6 +547,7 @@ intltoolize --automake --copy --force make %{?_smp_mflags} + %install # install NM make install DESTDIR=%{buildroot} @@ -606,6 +612,7 @@ else --slave %{_sbindir}/ifdown ifdown %{_libexecdir}/nm-ifdown fi + %preun if [ $1 -eq 0 ]; then # Package removal, not upgrade @@ -618,6 +625,7 @@ if [ $1 -eq 0 ]; then fi %systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service + %postun /usr/bin/udevadm control --reload-rules || : /usr/bin/udevadm trigger --subsystem-match=net || : @@ -685,6 +693,7 @@ fi %doc NEWS AUTHORS README CONTRIBUTING TODO %license COPYING + %if %{with adsl} %files adsl %{nmplugindir}/libnm-device-plugin-adsl.so @@ -692,27 +701,32 @@ fi %exclude %{nmplugindir}/libnm-device-plugin-adsl.so %endif + %if %{with bluetooth} %files bluetooth %{nmplugindir}/libnm-device-plugin-bluetooth.so %endif + %if %{with team} %files team %{nmplugindir}/libnm-device-plugin-team.so %endif + %if %{with wifi} %files wifi %{nmplugindir}/libnm-device-plugin-wifi.so %endif + %if %{with wwan} %files wwan %{nmplugindir}/libnm-device-plugin-wwan.so %{nmplugindir}/libnm-wwan.so %endif + %if %{with ovs} %files ovs %{nmplugindir}/libnm-device-plugin-ovs.so @@ -720,12 +734,14 @@ fi %{_mandir}/man7/nm-openvswitch.7* %endif + %if %{with ppp} %files ppp %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so %{nmplugindir}/libnm-ppp-plugin.so %endif + %if %{with libnm_glib} %files glib -f %{name}.lang %{_libdir}/libnm-glib.so.* @@ -735,6 +751,7 @@ fi %{_libdir}/girepository-1.0/NMClient-1.0.typelib %endif + %if %{with libnm_glib} %files glib-devel %doc docs/api/html/* @@ -766,10 +783,12 @@ fi %{_datadir}/vala/vapi/libnm-*.vapi %endif + %files libnm -f %{name}.lang %{_libdir}/libnm.so.* %{_libdir}/girepository-1.0/NM-1.0.typelib + %files libnm-devel %doc docs/api/html/* %dir %{_includedir}/libnm @@ -785,6 +804,7 @@ fi %{_datadir}/vala/vapi/libnm.vapi %{_datadir}/dbus-1/interfaces/*.xml + %if %{with connectivity_fedora} %files config-connectivity-fedora %dir %{nmlibdir} @@ -792,16 +812,19 @@ fi %{nmlibdir}/conf.d/20-connectivity-fedora.conf %endif + %files config-server %dir %{nmlibdir} %dir %{nmlibdir}/conf.d %{nmlibdir}/conf.d/00-server.conf + %files dispatcher-routing-rules %{_sysconfdir}/%{name}/dispatcher.d/10-ifcfg-rh-routes.sh %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh + %if %{with nmtui} %files tui %{_bindir}/nmtui @@ -811,5 +834,6 @@ fi %{_mandir}/man1/nmtui* %endif + %changelog __CHANGELOG__ |