From 1117a6f1f783bd2e12a8e71ad05bbdc461f19631 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 11 Aug 2018 09:53:52 +0200 Subject: [PATCH] fix compile error due to NM_AVAILABLE_IN_1_12_2 --- ...ile-error-due-to-NM_AVAILABLE_IN_1_1.patch | 29 +++++++++++++++++++ NetworkManager.spec | 10 +++++-- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch diff --git a/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch b/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch new file mode 100644 index 0000000..7940fb9 --- /dev/null +++ b/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch @@ -0,0 +1,29 @@ +From 0a3755c1799d3a4dc1875d4c59c7c568a64c8456 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +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 +-- +2.17.1 + diff --git a/NetworkManager.spec b/NetworkManager.spec index 6a82138..82bc89f 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -10,7 +10,7 @@ %global epoch_version 1 %global rpm_version 1.12.2 %global real_version 1.12.2 -%global release_version 1 +%global release_version 2 %global snapshot %{nil} %global git_sha %{nil} @@ -109,6 +109,7 @@ Source2: 00-server.conf Source3: 20-connectivity-fedora.conf Source4: 20-connectivity-redhat.conf +Patch0: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c179.patch#/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch #Patch1: 0001-some.patch Requires(post): systemd @@ -435,7 +436,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %prep %setup -q -n NetworkManager-%{real_version} - +%patch0 -p1 #%patch1 -p1 @@ -853,7 +854,10 @@ fi %endif %changelog -* Wed Jul 25 2018 Lubomir Rintel - 1:1.12.2-2 +* Sat Aug 11 2018 Lubomir Rintel - 1:1.12.2-2 +- fix compile error due to NM_AVAILABLE_IN_1_12_2 + +* Wed Jul 25 2018 Lubomir Rintel - 1:1.12.2-1 - Update to 1.12.2 release * Thu Jul 12 2018 Fedora Release Engineering - 1:1.12.0-1.1