diff --git a/0001-build-meson-fix-typo-in-generation-of-libnm-gtk.pc.patch b/0001-build-meson-fix-typo-in-generation-of-libnm-gtk.pc.patch new file mode 100644 index 0000000..e8ac7fa --- /dev/null +++ b/0001-build-meson-fix-typo-in-generation-of-libnm-gtk.pc.patch @@ -0,0 +1,28 @@ +From 3d7c0a89da37074e6986262d4708d4093bf496f2 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Wed, 8 Nov 2017 13:21:43 +0100 +Subject: [PATCH] build(meson): fix typo in generation of libnm-gtk.pc + +Fixes: 1c1168d4c7a9ed600ea880ed953b9d05b8f04582 + +https://bugzilla.gnome.org/show_bug.cgi?id=790056 +--- + src/libnm-gtk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnm-gtk/meson.build b/src/libnm-gtk/meson.build +index cc6785dadd04..569ee8121ac9 100644 +--- a/src/libnm-gtk/meson.build ++++ b/src/libnm-gtk/meson.build +@@ -92,7 +92,7 @@ pkg.generate( + requires: [ + 'NetworkManager ' + nm_req_version, + 'libnm-util ' + nm_req_version, +- 'linm-glib ' + nm_req_version, ++ 'libnm-glib ' + nm_req_version, + 'gtk+-3.0 ' + gtk_req_version + ], + variables: 'exec_prefix=' + nma_prefix, +-- +2.14.3 + diff --git a/network-manager-applet.spec b/network-manager-applet.spec index b855c10..56518ea 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -5,7 +5,7 @@ %global rpm_version 1.8.6 %global real_version 1.8.6 -%global release_version 2 +%global release_version 3 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') @@ -22,6 +22,7 @@ Source: https://download.gnome.org/sources/network-manager-applet/%{real_version Patch1: 0001-nm-applet-no-notifications.patch Patch2: 0001-meson-belatedly-bump-the-version.patch Patch3: 0002-meson-Make-sure-the-entire-wireless-security-static-.patch +Patch4: 0001-build-meson-fix-typo-in-generation-of-libnm-gtk.pc.patch Requires: NetworkManager >= %{nm_version} Requires: NetworkManager-glib >= %{nm_version} @@ -126,6 +127,7 @@ This package deprecates libnm-gtk. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %meson \ @@ -239,6 +241,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Nov 13 2017 Kalev Lember - 1.8.6-3 +- Backport an upstream patch to fix generated .pc file + * Wed Nov 08 2017 Lubomir Rintel - 1.8.6-2 - Meson build fixups