From 5bbc03fec677d51dbea4d0c33a3c018522880fba Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Jun 18 2015 20:53:53 +0000 Subject: Import a more recent 1.0 snapshot Something reasonably close to this will hopefully make it into upstream 1.0.4 release. Let's see if it works well enough. --- diff --git a/.gitignore b/.gitignore index e8cbd39..89fd955 100644 --- a/.gitignore +++ b/.gitignore @@ -312,3 +312,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.0.1.git20150305.2a72527c.tar.bz2 /NetworkManager-1.0.1.git20150429.a658561.tar.bz2 /NetworkManager-1.0.2.tar.xz +/NetworkManager-1.0.3.tar.bz2 diff --git a/10-ibft-plugin.conf b/10-ibft-plugin.conf new file mode 100644 index 0000000..482ae2a --- /dev/null +++ b/10-ibft-plugin.conf @@ -0,0 +1,11 @@ +# This file enables the standalone 'iBFT' settings plugin to read +# iBFT information with iscsiadm and create connections from that +# data. +# +# Do not edit this file; it will be overwritten on upgrades. If you +# want to override the values here, or set additional values, you can +# do so by adding another file (eg, "99-local.conf") to this directory +# and setting keys there. + +[main] +plugins+=ibft diff --git a/NetworkManager.conf b/NetworkManager.conf index 65e34a4..900ca9b 100644 --- a/NetworkManager.conf +++ b/NetworkManager.conf @@ -1,2 +1,15 @@ +# Configuration file for NetworkManager. +# +# See "man 5 NetworkManager.conf" for details. +# +# The directory /etc/NetworkManager/conf.d/ can contain additional configuration +# snippets that are installed by some packages. Those snippets override the +# settings from this main file. +# To override a configuration from a conf.d/ snippet, add another configuration +# with a name sorted lastly (such as 99-my.conf). + [main] -plugins=ifcfg-rh +plugins=ifcfg-rh,ibft + +[logging] +#level=DEBUG diff --git a/NetworkManager.spec b/NetworkManager.spec index 4258cc3..d1fe639 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -8,9 +8,9 @@ %define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) %define snapshot %{nil} -%define git_sha %{nil} -%define realversion 1.0.2 -%define release_version 1 +%define release_version 0.1.git20150618 +%define git_sha 8cffaf3bf5 +%define realversion 1.0.4 %define epoch_version 1 %define obsoletes_nmver 1:0.9.9.95-1 @@ -49,6 +49,15 @@ %global with_wwan 1 %endif +%ifarch s390 s390x +# No hardware-based plugins on s390 +%global with_adsl 0 +%global with_bluetooth 0 +%global with_wifi 0 +%global with_wimax 0 +%global with_wwan 0 +%endif + %if (0%{?fedora} && 0%{?fedora} <= 19) %global with_team 0 %endif @@ -66,15 +75,16 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{realversion} -Release: %{release_version}%{snapshot}%{git_sha_version}%{?dist}.1 +Release: %{release_version}%{snapshot}%{git_sha_version}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{realversion}%{snapshot}%{git_sha_version}.tar.xz +Source: NetworkManager-1.0.3.tar.bz2 Source1: NetworkManager.conf Source2: 00-server.conf -Source3: 20-connectivity-fedora.conf +Source3: 10-ibft-plugin.conf +Source4: 20-connectivity-fedora.conf # Not upstream. Patch0: 0000-explain-dns1-dns2.patch @@ -173,7 +183,6 @@ services. Summary: ADSL device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: rp-pppoe Obsoletes: NetworkManager < %{obsoletes_nmver} Obsoletes: NetworkManager-atm @@ -358,7 +367,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %endif %prep -%setup -q -n NetworkManager-%{realversion} +%setup -q -n NetworkManager-1.0.3 %patch0 -p1 -b .0000-explain-dns1-dns2.orig @@ -437,6 +446,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d %{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d # create a VPN directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN @@ -447,6 +457,13 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d # create a dnsmasq.d directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dnsmasq.d +# create dispatcher directories +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/pre-down.d +%{__cp} examples/dispatcher/10-ifcfg-rh-routes.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/ +%{__ln_s} ../10-ifcfg-rh-routes.sh $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/ + %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager @@ -467,7 +484,14 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d %{__rm} -rf $RPM_BUILD_ROOT +%check +make check + + %post +/usr/bin/udevadm control --reload-rules || : +/usr/bin/udevadm trigger --subsystem-match=net || : + %systemd_post NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service %preun @@ -481,6 +505,9 @@ fi %systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service %postun +/usr/bin/udevadm control --reload-rules || : +/usr/bin/udevadm trigger --subsystem-match=net || : + %systemd_postun @@ -500,8 +527,10 @@ fi %{_datadir}/bash-completion/completions/nmcli %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/dispatcher.d +%{_sysconfdir}/%{name}/dispatcher.d/10-ifcfg-rh-routes.sh %dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d %dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d +%{_sysconfdir}/%{name}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh %dir %{_sysconfdir}/%{name}/dnsmasq.d %dir %{_sysconfdir}/%{name}/VPN %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf @@ -515,6 +544,7 @@ fi %if 0%{?with_nmtui} %exclude %{_mandir}/man1/nmtui* %endif +%config %{_sysconfdir}/%{name}/conf.d/10-ibft-plugin.conf %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* @@ -653,6 +683,9 @@ fi %endif %changelog +* Thu Jun 18 2015 Lubomir Rintel - 1:1.0.4-0.1.git20150618.8cffaf3bf5 +- Update to a recent Git snapshot + * Tue Jun 16 2015 Fedora Release Engineering - 1:1.0.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index eab6459..d210210 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a4899f89edcbdd1ac46d2d947e8d6eb NetworkManager-1.0.2.tar.xz +a06b52560cd7ed8334865d9d7666556f NetworkManager-1.0.3.tar.bz2