fix compile error due to NM_AVAILABLE_IN_1_12_2
This commit is contained in:
parent
e49edc693e
commit
1117a6f1f7
@ -0,0 +1,29 @@
|
|||||||
|
From 0a3755c1799d3a4dc1875d4c59c7c568a64c8456 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Haller <thaller@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
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
@ -10,7 +10,7 @@
|
|||||||
%global epoch_version 1
|
%global epoch_version 1
|
||||||
%global rpm_version 1.12.2
|
%global rpm_version 1.12.2
|
||||||
%global real_version 1.12.2
|
%global real_version 1.12.2
|
||||||
%global release_version 1
|
%global release_version 2
|
||||||
%global snapshot %{nil}
|
%global snapshot %{nil}
|
||||||
%global git_sha %{nil}
|
%global git_sha %{nil}
|
||||||
|
|
||||||
@ -109,6 +109,7 @@ Source2: 00-server.conf
|
|||||||
Source3: 20-connectivity-fedora.conf
|
Source3: 20-connectivity-fedora.conf
|
||||||
Source4: 20-connectivity-redhat.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
|
#Patch1: 0001-some.patch
|
||||||
|
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
@ -435,7 +436,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n NetworkManager-%{real_version}
|
%setup -q -n NetworkManager-%{real_version}
|
||||||
|
%patch0 -p1
|
||||||
#%patch1 -p1
|
#%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
@ -853,7 +854,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jul 25 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:1.12.2-2
|
* Sat Aug 11 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:1.12.2-2
|
||||||
|
- fix compile error due to NM_AVAILABLE_IN_1_12_2
|
||||||
|
|
||||||
|
* Wed Jul 25 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:1.12.2-1
|
||||||
- Update to 1.12.2 release
|
- Update to 1.12.2 release
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-1.1
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-1.1
|
||||||
|
Loading…
Reference in New Issue
Block a user