diff --git a/.gitignore b/.gitignore index ccfe4d1..08df0b1 100644 --- a/.gitignore +++ b/.gitignore @@ -372,3 +372,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.22.10.tar.xz /NetworkManager-1.23.90.tar.xz /NetworkManager-1.23.91.tar.xz +/NetworkManager-1.24.0.tar.xz diff --git a/0001-nm-online-fix-build-of-nm-online-for-missing-libcsip.patch b/0001-nm-online-fix-build-of-nm-online-for-missing-libcsip.patch deleted file mode 100644 index 25b830f..0000000 --- a/0001-nm-online-fix-build-of-nm-online-for-missing-libcsip.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fea106f29d34f69bbc8d31d41702f1377ef08426 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Sat, 2 May 2020 22:39:53 +0200 -Subject: [PATCH 1/1] nm-online: fix build of nm-online for missing - libcsiphash.la - -Fixes: e468b48ab7b8 ('nm-online: allow configuring timeout via NM_ONLINE_TIMEOUT environment') -(cherry picked from commit 69798fa6cd841c54915fdbee048ccd5765313a9b) -(cherry picked from commit 53476d821d3c66896bcdc0e6f26a60c0a184f469) ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 6cb709b8d545..35564aa5c578 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4289,6 +4289,7 @@ clients_nm_online_LDADD = \ - shared/nm-libnm-aux/libnm-libnm-aux.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ -+ shared/libcsiphash.la \ - $(GLIB_LIBS) \ - $(NULL) - --- -2.25.4 - diff --git a/NetworkManager.spec b/NetworkManager.spec index 1496ac2..c842322 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,8 +6,8 @@ %global epoch_version 1 %global rpm_version 1.24.0 -%global real_version 1.23.91 -%global release_version 0.2 +%global real_version 1.24.0 +%global release_version 1 %global snapshot %{nil} %global git_sha %{nil} @@ -136,7 +136,6 @@ Source5: 20-connectivity-redhat.conf Source6: 70-nm-connectivity.conf #Patch1: 0001-some.patch -Patch1: 0001-nm-online-fix-build-of-nm-online-for-missing-libcsip.patch Requires(post): systemd Requires(post): /usr/sbin/update-alternatives @@ -1052,6 +1051,9 @@ fi %changelog +* Fri May 8 2020 Thomas Haller