[packages/NetworkManager] upstream patch to fix broken header; rel 2
atler
atler at pld-linux.org
Tue Aug 7 18:51:11 CEST 2018
commit d516333647d6d25b713934dcb15467f04e361a65
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Aug 7 18:50:46 2018 +0200
upstream patch to fix broken header; rel 2
NetworkManager.spec | 4 +++-
version.patch | 26 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 8e8b67d..407b70d 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@ Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
Version: 1.12.2
-Release: 1
+Release: 2
Epoch: 2
License: GPL v2+
Group: Networking/Admin
@@ -19,6 +19,7 @@ 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
@@ -193,6 +194,7 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
%patch0 -p1
%patch1 -p1
%{?with_systemd:%patch2 -p1}
+%patch3 -p1
%build
%{__gtkdocize}
diff --git a/version.patch b/version.patch
new file mode 100644
index 0000000..338abd8
--- /dev/null
+++ b/version.patch
@@ -0,0 +1,26 @@
+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/d516333647d6d25b713934dcb15467f04e361a65
More information about the pld-cvs-commit
mailing list