contrib/rpm: use whitespace consistently
Double newline is used to visually separate sections.
This commit is contained in:
@@ -384,6 +384,7 @@ This adds a NetworkManager configuration file to enable connectivity checking
|
|||||||
via Fedora infrastructure.
|
via Fedora infrastructure.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%package config-server
|
%package config-server
|
||||||
Summary: NetworkManager config file for "server-like" defaults
|
Summary: NetworkManager config file for "server-like" defaults
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@@ -399,6 +400,7 @@ ethernet devices with no carrier.
|
|||||||
This package is intended to be installed by default for server
|
This package is intended to be installed by default for server
|
||||||
deployments.
|
deployments.
|
||||||
|
|
||||||
|
|
||||||
%package dispatcher-routing-rules
|
%package dispatcher-routing-rules
|
||||||
Summary: NetworkManager dispatcher file for advanced routing rules
|
Summary: NetworkManager dispatcher file for advanced routing rules
|
||||||
Group: System Environment/Base
|
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
|
configurations using "/etc/sysconfig/network-scripts/rule-NAME" files
|
||||||
(eg, to do policy-based routing).
|
(eg, to do policy-based routing).
|
||||||
|
|
||||||
|
|
||||||
%if 0%{with_nmtui}
|
%if 0%{with_nmtui}
|
||||||
%package tui
|
%package tui
|
||||||
Summary: NetworkManager curses-based UI
|
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.
|
by nm-connection-editor and nm-applet in a non-graphical environment.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n NetworkManager-%{real_version}
|
%setup -q -n NetworkManager-%{real_version}
|
||||||
|
|
||||||
#%patch1 -p1
|
#%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{with regen_docs}
|
%if %{with regen_docs}
|
||||||
gtkdocize
|
gtkdocize
|
||||||
@@ -542,6 +547,7 @@ intltoolize --automake --copy --force
|
|||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# install NM
|
# install NM
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
@@ -606,6 +612,7 @@ else
|
|||||||
--slave %{_sbindir}/ifdown ifdown %{_libexecdir}/nm-ifdown
|
--slave %{_sbindir}/ifdown ifdown %{_libexecdir}/nm-ifdown
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ $1 -eq 0 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
# Package removal, not upgrade
|
# Package removal, not upgrade
|
||||||
@@ -618,6 +625,7 @@ if [ $1 -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
|
||||||
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/usr/bin/udevadm control --reload-rules || :
|
/usr/bin/udevadm control --reload-rules || :
|
||||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||||
@@ -685,6 +693,7 @@ fi
|
|||||||
%doc NEWS AUTHORS README CONTRIBUTING TODO
|
%doc NEWS AUTHORS README CONTRIBUTING TODO
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
|
||||||
|
|
||||||
%if %{with adsl}
|
%if %{with adsl}
|
||||||
%files adsl
|
%files adsl
|
||||||
%{nmplugindir}/libnm-device-plugin-adsl.so
|
%{nmplugindir}/libnm-device-plugin-adsl.so
|
||||||
@@ -692,27 +701,32 @@ fi
|
|||||||
%exclude %{nmplugindir}/libnm-device-plugin-adsl.so
|
%exclude %{nmplugindir}/libnm-device-plugin-adsl.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with bluetooth}
|
%if %{with bluetooth}
|
||||||
%files bluetooth
|
%files bluetooth
|
||||||
%{nmplugindir}/libnm-device-plugin-bluetooth.so
|
%{nmplugindir}/libnm-device-plugin-bluetooth.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with team}
|
%if %{with team}
|
||||||
%files team
|
%files team
|
||||||
%{nmplugindir}/libnm-device-plugin-team.so
|
%{nmplugindir}/libnm-device-plugin-team.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with wifi}
|
%if %{with wifi}
|
||||||
%files wifi
|
%files wifi
|
||||||
%{nmplugindir}/libnm-device-plugin-wifi.so
|
%{nmplugindir}/libnm-device-plugin-wifi.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with wwan}
|
%if %{with wwan}
|
||||||
%files wwan
|
%files wwan
|
||||||
%{nmplugindir}/libnm-device-plugin-wwan.so
|
%{nmplugindir}/libnm-device-plugin-wwan.so
|
||||||
%{nmplugindir}/libnm-wwan.so
|
%{nmplugindir}/libnm-wwan.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with ovs}
|
%if %{with ovs}
|
||||||
%files ovs
|
%files ovs
|
||||||
%{nmplugindir}/libnm-device-plugin-ovs.so
|
%{nmplugindir}/libnm-device-plugin-ovs.so
|
||||||
@@ -720,12 +734,14 @@ fi
|
|||||||
%{_mandir}/man7/nm-openvswitch.7*
|
%{_mandir}/man7/nm-openvswitch.7*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with ppp}
|
%if %{with ppp}
|
||||||
%files ppp
|
%files ppp
|
||||||
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
||||||
%{nmplugindir}/libnm-ppp-plugin.so
|
%{nmplugindir}/libnm-ppp-plugin.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with libnm_glib}
|
%if %{with libnm_glib}
|
||||||
%files glib -f %{name}.lang
|
%files glib -f %{name}.lang
|
||||||
%{_libdir}/libnm-glib.so.*
|
%{_libdir}/libnm-glib.so.*
|
||||||
@@ -735,6 +751,7 @@ fi
|
|||||||
%{_libdir}/girepository-1.0/NMClient-1.0.typelib
|
%{_libdir}/girepository-1.0/NMClient-1.0.typelib
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{with libnm_glib}
|
%if %{with libnm_glib}
|
||||||
%files glib-devel
|
%files glib-devel
|
||||||
%doc docs/api/html/*
|
%doc docs/api/html/*
|
||||||
@@ -766,10 +783,12 @@ fi
|
|||||||
%{_datadir}/vala/vapi/libnm-*.vapi
|
%{_datadir}/vala/vapi/libnm-*.vapi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files libnm -f %{name}.lang
|
%files libnm -f %{name}.lang
|
||||||
%{_libdir}/libnm.so.*
|
%{_libdir}/libnm.so.*
|
||||||
%{_libdir}/girepository-1.0/NM-1.0.typelib
|
%{_libdir}/girepository-1.0/NM-1.0.typelib
|
||||||
|
|
||||||
|
|
||||||
%files libnm-devel
|
%files libnm-devel
|
||||||
%doc docs/api/html/*
|
%doc docs/api/html/*
|
||||||
%dir %{_includedir}/libnm
|
%dir %{_includedir}/libnm
|
||||||
@@ -785,6 +804,7 @@ fi
|
|||||||
%{_datadir}/vala/vapi/libnm.vapi
|
%{_datadir}/vala/vapi/libnm.vapi
|
||||||
%{_datadir}/dbus-1/interfaces/*.xml
|
%{_datadir}/dbus-1/interfaces/*.xml
|
||||||
|
|
||||||
|
|
||||||
%if %{with connectivity_fedora}
|
%if %{with connectivity_fedora}
|
||||||
%files config-connectivity-fedora
|
%files config-connectivity-fedora
|
||||||
%dir %{nmlibdir}
|
%dir %{nmlibdir}
|
||||||
@@ -792,16 +812,19 @@ fi
|
|||||||
%{nmlibdir}/conf.d/20-connectivity-fedora.conf
|
%{nmlibdir}/conf.d/20-connectivity-fedora.conf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files config-server
|
%files config-server
|
||||||
%dir %{nmlibdir}
|
%dir %{nmlibdir}
|
||||||
%dir %{nmlibdir}/conf.d
|
%dir %{nmlibdir}/conf.d
|
||||||
%{nmlibdir}/conf.d/00-server.conf
|
%{nmlibdir}/conf.d/00-server.conf
|
||||||
|
|
||||||
|
|
||||||
%files dispatcher-routing-rules
|
%files dispatcher-routing-rules
|
||||||
%{_sysconfdir}/%{name}/dispatcher.d/10-ifcfg-rh-routes.sh
|
%{_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/no-wait.d/10-ifcfg-rh-routes.sh
|
||||||
%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh
|
%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh
|
||||||
|
|
||||||
|
|
||||||
%if %{with nmtui}
|
%if %{with nmtui}
|
||||||
%files tui
|
%files tui
|
||||||
%{_bindir}/nmtui
|
%{_bindir}/nmtui
|
||||||
@@ -811,5 +834,6 @@ fi
|
|||||||
%{_mandir}/man1/nmtui*
|
%{_mandir}/man1/nmtui*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
__CHANGELOG__
|
__CHANGELOG__
|
||||||
|
Reference in New Issue
Block a user