[packages/NetworkManager] up to 1.10.0
atler
atler at pld-linux.org
Sat Dec 9 18:46:32 CET 2017
commit c26388c7cc84fd00ec4c189c446ca6c71febcaf9
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Dec 9 18:45:37 2017 +0100
up to 1.10.0
NetworkManager-sh.patch | 18 +++++++++---------
NetworkManager.spec | 13 +++++++------
systemd-fallback.patch | 12 ++++++------
3 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 30719c0..0b4f3b3 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,13 +6,13 @@
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 1.8.2
+Version: 1.10.0
Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: 1acf7a551905ae85d9987aadbb5f7205
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: c4308b83f77a7cb8c6e0e0ec1a30c89f
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
@@ -302,6 +302,7 @@ exit 0
%dir %{_libdir}/NetworkManager
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-adsl.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-ovs.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wifi.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wwan.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-team.so
@@ -322,9 +323,8 @@ exit 0
%{systemdunitdir}/NetworkManager.service
%{systemdunitdir}/NetworkManager-dispatcher.service
%{systemdunitdir}/NetworkManager-wait-online.service
-# XXX: dir here or add to systemd-units?
-%dir %{systemdunitdir}/network-online.target.wants
-%{systemdunitdir}/network-online.target.wants/NetworkManager-wait-online.service
+%dir %{systemdunitdir}/NetworkManager.service.d
+%{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%{systemdtmpfilesdir}/%{name}.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -357,6 +357,7 @@ exit 0
%{_mandir}/man5/nm-settings-keyfile.5*
%{_mandir}/man5/nm-settings.5*
%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man7/nm-openvswitch.7*
%{_mandir}/man7/nmcli-examples.7*
%{_mandir}/man8/NetworkManager.8*
%{_examplesdir}/%{name}-%{version}
diff --git a/NetworkManager-sh.patch b/NetworkManager-sh.patch
index 21f4095..42c0012 100644
--- a/NetworkManager-sh.patch
+++ b/NetworkManager-sh.patch
@@ -1,11 +1,11 @@
---- NetworkManager-1.6.0/configure.ac.orig 2017-01-26 20:02:45.780051652 +0100
-+++ NetworkManager-1.6.0/configure.ac 2017-01-26 20:04:46.173383613 +0100
-@@ -1125,7 +1125,7 @@
- build_setting_docs=no
+--- NetworkManager-1.10.0/configure.ac.orig 2017-12-09 18:16:02.242310397 +0100
++++ NetworkManager-1.10.0/configure.ac 2017-12-09 18:17:47.650126844 +0100
+@@ -1260,7 +1260,7 @@
+ build_docs=no
if test -n "$INTROSPECTION_MAKEFILE"; then
- # If g-i is installed we know we have python, but we might not have pygobject
-- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
-+ if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
- fi
+ # If g-i is installed we know we have python, but we might not have pygobject
+- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
++ if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
+ AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
+ fi
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index b27bacb..496d7b6 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -4,10 +4,10 @@
# output
session_tracking=
if test "$use_systemd_logind" = "yes" -o "$use_systemd_logind" = "auto"; then
-- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
-+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-daemon libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
+- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd], [have_systemd_logind=yes], [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-daemon libsystemd-login], [have_systemd_logind=yes], [have_systemd_logind=no])])
else
- have_systemd_logind=no
+ have_systemd_logind=no
fi
@@ -477,11 +477,12 @@
@@ -20,9 +20,9 @@
+AC_DEFINE([CKDB_PATH], "/var/run/ConsoleKit/database", [Path to ConsoleKit database])
+
- AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd|elogind|consolekit], [Build NetworkManager with specific suspend/resume support]))
- if test "z$with_suspend_resume" = "z"; then
- PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes],
+ AC_ARG_WITH(suspend-resume,
+ AS_HELP_STRING([--with-suspend-resume=upower|systemd|elogind|consolekit],
+ [Build NetworkManager with specific suspend/resume support]))
--- NetworkManager-1.8.0/src/nm-session-monitor.c.orig 2017-05-10 10:59:08.000000000 +0200
+++ NetworkManager-1.8.0/src/nm-session-monitor.c 2017-05-27 23:07:26.988108884 +0200
@@ -33,6 +33,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/c26388c7cc84fd00ec4c189c446ca6c71febcaf9
More information about the pld-cvs-commit
mailing list