Update to 1.12.4 release
This commit is contained in:
Thomas Haller
parent
ac2eac23f7
commit
80d5ced8b9
|
|
@ -348,3 +348,4 @@ network-manager-applet-0.8.1.tar.bz2
|
|||
/NetworkManager-1.11.90.tar.xz
|
||||
/NetworkManager-1.12.0.tar.xz
|
||||
/NetworkManager-1.12.2.tar.xz
|
||||
/NetworkManager-1.12.4.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
From 9e31748442e081dfb045bffa703afa8693005ad3 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Sat, 11 Aug 2018 11:08:42 +0200
|
||||
Subject: [PATCH] utils/test: don't assert on debug level messages
|
||||
|
||||
They come and go in GLib core for all sorts of purposes. Don't let that
|
||||
break our tests.
|
||||
---
|
||||
shared/nm-utils/nm-test-utils.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
|
||||
index 743893f03..03d2f73c8 100644
|
||||
--- a/shared/nm-utils/nm-test-utils.h
|
||||
+++ b/shared/nm-utils/nm-test-utils.h
|
||||
@@ -574,7 +574,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
|
||||
} else {
|
||||
/* We were called not to set logging levels. This means, that the user
|
||||
* expects to assert against (all) messages. Any uncought message is fatal. */
|
||||
- g_log_set_always_fatal (G_LOG_LEVEL_MASK);
|
||||
+ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG);
|
||||
}
|
||||
|
||||
if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) &&
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -8,9 +8,9 @@
|
|||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||
|
||||
%global epoch_version 1
|
||||
%global rpm_version 1.12.2
|
||||
%global real_version 1.12.2
|
||||
%global release_version 2
|
||||
%global rpm_version 1.12.4
|
||||
%global real_version 1.12.4
|
||||
%global release_version 1
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
|
||||
|
|
@ -109,8 +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-utils-test-don-t-assert-on-debug-level-messages.patch
|
||||
#Patch1: 0001-some.patch
|
||||
|
||||
Requires(post): systemd
|
||||
Requires(post): /usr/sbin/update-alternatives
|
||||
|
|
@ -436,8 +435,8 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
|||
|
||||
%prep
|
||||
%setup -q -n NetworkManager-%{real_version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
#%patch1 -p1
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -667,9 +666,9 @@ fi
|
|||
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
|
||||
%{_bindir}/nm-online
|
||||
%{_libexecdir}/nm-ifup
|
||||
%ghost %{_sbindir}/ifup
|
||||
%ghost %attr(755, root, root) %{_sbindir}/ifup
|
||||
%{_libexecdir}/nm-ifdown
|
||||
%ghost %{_sbindir}/ifdown
|
||||
%ghost %attr(755, root, root) %{_sbindir}/ifdown
|
||||
%{_libexecdir}/nm-dhcp-helper
|
||||
%{_libexecdir}/nm-dispatcher
|
||||
%{_libexecdir}/nm-iface-helper
|
||||
|
|
@ -853,7 +852,11 @@ fi
|
|||
%{_mandir}/man1/nmtui*
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 18 2018 Thomas Haller <thaller@redhat.com> - 1:1.12.4-1
|
||||
- Update to 1.12.4 release
|
||||
|
||||
* 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
|
||||
|
||||
|
|
@ -3292,4 +3295,3 @@ fi
|
|||
|
||||
* Fri Aug 20 2004 Dan Williams <dcbw@redhat.com> 0.1-3
|
||||
- First public release
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (NetworkManager-1.12.2.tar.xz) = cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35
|
||||
SHA512 (NetworkManager-1.12.4.tar.xz) = 6fc891a6f8c3b4cc43449dabf0c025a9e706b723f602085f34cc93bda885c300de293004390c4926b95e26201b86d97ecd23160f82ef03e4d2b680f822c827c3
|
||||
|
|
|
|||
Loading…
Reference in New Issue