diff --git a/.gitignore b/.gitignore index 9c2cf4d..0cbfcdc 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /network-manager-applet-1.8.2.tar.xz /network-manager-applet-1.8.4.tar.xz /network-manager-applet-1.8.6.tar.xz +/network-manager-applet-1.8.8.tar.xz 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 deleted file mode 100644 index e8ac7fa..0000000 --- a/0001-build-meson-fix-typo-in-generation-of-libnm-gtk.pc.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0001-meson-belatedly-bump-the-version.patch b/0001-meson-belatedly-bump-the-version.patch deleted file mode 100644 index aeeb7f3..0000000 --- a/0001-meson-belatedly-bump-the-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b5a1297a027d47ffcf248df8e95eb4268e737b98 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 8 Nov 2017 10:34:37 +0100 -Subject: [PATCH 1/2] meson: belatedly bump the version - -(cherry picked from commit f5f919e903bb9ffe2e5ee34a59ccb78792c08c3b) ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c8583c6a..658b2a8c 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project( - 'network-manager-applet', 'c', -- version: '1.8.5', -+ version: '1.8.6', - license: 'GPL2+', - default_options: [ - 'b_lundef=true', --- -2.14.2 - diff --git a/0002-meson-Make-sure-the-entire-wireless-security-static-.patch b/0002-meson-Make-sure-the-entire-wireless-security-static-.patch deleted file mode 100644 index b5c0897..0000000 --- a/0002-meson-Make-sure-the-entire-wireless-security-static-.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 93a73fe56a59bedd0e7a9e6628029f4c4b57ed98 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 7 Nov 2017 22:11:47 +0100 -Subject: [PATCH 2/2] meson: Make sure the entire wireless-security static lib - is used - -Otherwise ld will not link in the gresources, which contain no "needed" -(as far as ld can determine) symbols. - -(cherry picked from commit 6a0967b1b013dfff01da681006a825050bb06661) ---- - src/connection-editor/meson.build | 5 +++-- - src/libnm-gtk/meson.build | 5 +++-- - src/libnma/meson.build | 5 +++-- - src/meson.build | 10 +++++++++- - src/wireless-security/meson.build | 10 ---------- - 5 files changed, 18 insertions(+), 17 deletions(-) - -diff --git a/src/connection-editor/meson.build b/src/connection-editor/meson.build -index 990f1b47..004303e4 100644 ---- a/src/connection-editor/meson.build -+++ b/src/connection-editor/meson.build -@@ -76,14 +76,14 @@ incs = [ - top_inc, - utils_inc, - src_inc, -- shared_inc -+ shared_inc, -+ wireless_security_inc - ] - - deps = [ - gtk_dep, - libnm_dep, - libnma_dep, -- libwireless_security_libnm_dep, - m_dep - ] - -@@ -117,6 +117,7 @@ executable( - c_args: cflags, - link_args: ldflags, - link_depends: linker_script_ver, -+ link_whole: libwireless_security_libnm, - install: true, - install_dir: nma_bindir - ) -diff --git a/src/libnm-gtk/meson.build b/src/libnm-gtk/meson.build -index 9aaf2194..cc6785da 100644 ---- a/src/libnm-gtk/meson.build -+++ b/src/libnm-gtk/meson.build -@@ -39,7 +39,8 @@ incs = [ - top_inc, - shared_inc, - src_inc, -- libnma_inc -+ libnma_inc, -+ wireless_security_inc - ] - - deps = [ -@@ -47,7 +48,6 @@ deps = [ - gudev_dep, - libnm_glib_dep, - libutils_libnm_glib_dep, -- libwireless_security_libnm_glib_dep - ] - - cflags = [ -@@ -77,6 +77,7 @@ libnm_gtk = shared_library( - c_args: cflags, - link_args: ldflags, - link_depends: symbol_map, -+ link_whole: libwireless_security_libnm_glib, - install: true, - install_dir: nma_libdir - ) -diff --git a/src/libnma/meson.build b/src/libnma/meson.build -index 0659268a..98a72aa7 100644 ---- a/src/libnma/meson.build -+++ b/src/libnma/meson.build -@@ -47,7 +47,8 @@ incs = [ - top_inc, - shared_inc, - src_inc, -- libnma_inc -+ libnma_inc, -+ wireless_security_inc - ] - - deps = [ -@@ -55,7 +56,6 @@ deps = [ - gudev_dep, - libnm_dep, - libutils_libnm_dep, -- libwireless_security_libnm_dep - ] - - cflags = [ -@@ -102,6 +102,7 @@ libnma = shared_library( - c_args: cflags, - link_args: ldflags, - link_depends: symbol_map, -+ link_whole: libwireless_security_libnm, - install: true, - install_dir: nma_libdir - ) -diff --git a/src/meson.build b/src/meson.build -index c8e28723..45ff2463 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -61,13 +61,20 @@ sources += gnome.compile_resources( - dependencies: resource_data - ) - -+incs = [ -+ top_inc, -+ utils_inc, -+ src_inc, -+ shared_inc, -+ wireless_security_inc -+] -+ - deps = [ - gtk_dep, - libnm_dep, - libnma_dep, - libnotify_dep, - libsecret_dep, -- libwireless_security_libnm_dep, - m_dep - ] - -@@ -109,6 +116,7 @@ executable( - c_args: cflags, - link_args: ldflags, - link_depends: linker_script_ver, -+ link_whole: libwireless_security_libnm, - install: true, - install_dir: nma_bindir - ) -diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build -index e3efcdb4..a4fbe97d 100644 ---- a/src/wireless-security/meson.build -+++ b/src/wireless-security/meson.build -@@ -57,11 +57,6 @@ libwireless_security_libnm = static_library( - dependencies: deps - ) - --libwireless_security_libnm_dep = declare_dependency( -- link_with: libwireless_security_libnm, -- include_directories: wireless_security_inc --) -- - if enable_libnm_gtk - deps = [ - gtk_dep, -@@ -78,9 +73,4 @@ if enable_libnm_gtk - dependencies: deps, - c_args: cflags - ) -- -- libwireless_security_libnm_glib_dep = declare_dependency( -- link_with: libwireless_security_libnm_glib, -- include_directories: wireless_security_inc -- ) - endif --- -2.14.2 - diff --git a/network-manager-applet.spec b/network-manager-applet.spec index 56518ea..663bc41 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -3,9 +3,9 @@ %global nm_version 1:1.1.0 %global obsoletes_ver 1:0.9.7 -%global rpm_version 1.8.6 -%global real_version 1.8.6 -%global release_version 3 +%global rpm_version 1.8.8 +%global real_version 1.8.8 +%global release_version 1 %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') @@ -20,9 +20,6 @@ Obsoletes: NetworkManager-gnome < %{obsoletes_ver} Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz 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} @@ -125,9 +122,6 @@ This package deprecates libnm-gtk. %prep %setup -q -n "%{name}-%{real_version}" %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %meson \ @@ -241,6 +235,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Mon Dec 18 2017 Lubomir Rintel - 1.8.8-1 +- Update to 1.8.8 release + * Mon Nov 13 2017 Kalev Lember - 1.8.6-3 - Backport an upstream patch to fix generated .pc file diff --git a/sources b/sources index 2bba01e..057951a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-manager-applet-1.8.6.tar.xz) = 9080fe1ef252837f16c698fe2083ebe66949e2a30f626619ef7eb82f44e988a0b8488f4f8cd0946a78a240f9bf7a5d054afc988b25c1bedeba7f79a7c84d46fa +SHA512 (network-manager-applet-1.8.8.tar.xz) = bb1258c60ee2cd848fedd60df1e799f590a3b396abe30c1b1e0156fc93875c5ef1aa9cc072f0802e336b9744d1784b50ad9d3cea3be14c1402a42f97f1466c45