[packages/NetworkManager] up to 1.14.0
atler
atler at pld-linux.org
Sat Sep 15 13:12:26 CEST 2018
commit b95ce425837bd0fa91bf78681ea83f2226ed513a
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Sep 15 13:11:43 2018 +0200
up to 1.14.0
- adapted systemd-fallback patch
- version patch no longer needed
NetworkManager.spec | 10 ++++------
systemd-fallback.patch | 34 ++++++++++------------------------
version.patch | 26 --------------------------
3 files changed, 14 insertions(+), 56 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9300c58..962d41a 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,20 +6,19 @@
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 1.12.2
-Release: 3
+Version: 1.14.0
+Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/%{name}-%{version}.tar.xz
-# Source0-md5: 94d02b80b120f166927e6ef242b29a9b
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.14/%{name}-%{version}.tar.xz
+# Source0-md5: bedae3bb29bc68825b6c616a68cc6ba9
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
Patch0: ifcfg-path.patch
Patch1: %{name}-sh.patch
Patch2: systemd-fallback.patch
-Patch3: version.patch
URL: https://wiki.gnome.org/Projects/NetworkManager
BuildRequires: ModemManager-devel >= 1.0.0
BuildRequires: audit-libs-devel
@@ -194,7 +193,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
%patch0 -p1
%patch1 -p1
%{?with_systemd:%patch2 -p1}
-%patch3 -p1
%build
%{__gtkdocize}
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 496d7b6..b426497 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -9,26 +9,12 @@
else
have_systemd_logind=no
fi
-@@ -477,11 +477,12 @@
-
- if test "$use_consolekit" = "yes"; then
- AC_DEFINE([SESSION_TRACKING_CONSOLEKIT], 1, [Define to 1 if ConsoleKit is available])
-- AC_DEFINE([CKDB_PATH], "/var/run/ConsoleKit/database", [Path to ConsoleKit database])
- session_tracking="$session_tracking, consolekit"
- fi
- session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')"
-
-+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]))
--- 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 @@
#endif
- #ifdef SESSION_TRACKING_SYSTEMD
+ #if SESSION_TRACKING_SYSTEMD
+#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
#define LOGIND_NAME "systemd-logind"
@@ -37,7 +23,7 @@
} sd;
#endif
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
struct {
GFileMonitor *monitor;
GHashTable *cache;
@@ -51,7 +37,7 @@
/*****************************************************************************/
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
typedef struct {
gboolean active;
} CkSession;
@@ -66,7 +52,7 @@
@@ -350,13 +347,16 @@ nm_session_monitor_session_exists (NMSes
g_return_val_if_fail (NM_IS_SESSION_MONITOR (self), FALSE);
- #ifdef SESSION_TRACKING_SYSTEMD
+ #if SESSION_TRACKING_XLOGIND
- if (st_sd_session_exists (self, uid, active))
- return TRUE;
+ if (sd_booted () > 0) {
@@ -75,11 +61,11 @@
+ } else {
#endif
-
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
if (ck_session_exists (self, uid, active))
return TRUE;
+
-+#ifdef SESSION_TRACKING_SYSTEMD
++#if SESSION_TRACKING_XLOGIND
+ }
#endif
@@ -87,14 +73,14 @@
@@ -368,26 +368,28 @@ static void
nm_session_monitor_init (NMSessionMonitor *monitor)
{
- #ifdef SESSION_TRACKING_SYSTEMD
+ #if SESSION_TRACKING_XLOGIND
+ if (sd_booted () > 0) {
st_sd_init (monitor);
_LOGD ("using "LOGIND_NAME" session tracking");
+ } else
#endif
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
+ {
ck_init (monitor);
_LOGD ("using ConsoleKit session tracking");
@@ -105,13 +91,13 @@
static void
finalize (GObject *object)
{
- #ifdef SESSION_TRACKING_SYSTEMD
+ #if SESSION_TRACKING_XLOGIND
+ if (sd_booted () > 0)
st_sd_finalize (NM_SESSION_MONITOR (object));
+ else
#endif
--#ifdef SESSION_TRACKING_CONSOLEKIT
+-#if SESSION_TRACKING_CONSOLEKIT
ck_finalize (NM_SESSION_MONITOR (object));
-#endif
diff --git a/version.patch b/version.patch
deleted file mode 100644
index 338abd8..0000000
--- a/version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0a3755c1799d3a4dc1875d4c59c7c568a64c8456 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller at redhat.com>
-Date: Tue, 31 Jul 2018 14:13:57 +0200
-Subject: [PATCH] version: fix compile error due to NM_AVAILABLE_IN_1_12_2
- macro
-
-Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
-
-https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
----
- libnm-core/nm-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
-index ee6dbc0bd..c24048955 100644
---- a/libnm-core/nm-version.h
-+++ b/libnm-core/nm-version.h
-@@ -161,7 +161,7 @@
- #endif
-
- #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
--# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2)
-+# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2)
- #else
- # define NM_AVAILABLE_IN_1_12_2
- #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/b95ce425837bd0fa91bf78681ea83f2226ed513a
More information about the pld-cvs-commit
mailing list