From bcd3b14a378b184309decc91c22a5305c39ce576 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 7 Jun 2018 22:04:40 +0200
Subject: [PATCH 1/2] update to version 2.2.0

---
 .gitignore                       |  2 ++
 sources                          |  2 +-
 wingpanel-indicator-network.spec | 29 +++++++++++------------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4881499..fc32810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /wingpanel-indicator-network-2.0.2.tar.xz
 /wingpanel-indicator-network-2.1.0.tar.gz
 /wingpanel-indicator-network-2.1.1.tar.gz
+/wingpanel-indicator-network-edd2b7a.tar.gz
+/wingpanel-indicator-network-2.2.0.tar.gz
diff --git a/sources b/sources
index ccfd166..af1c660 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wingpanel-indicator-network-2.1.1.tar.gz) = 7c83aa1c9d71c80826b92a636117850bc4805db6940fceb4622249c4135154a4b6ebb490b5ef440e41fdf01597ecc785f17e8cd493fb321c4ca4ef5fd439d784
+SHA512 (wingpanel-indicator-network-2.2.0.tar.gz) = d9daf4ba2bf1028a3980b4e00f9188d18f979e3bd6b1c4b65905110eb71a0f2ea40fbfe1ebfb5815ea3bf0b7e496939640715bfba276c2ea5db794cad40a3fd0
diff --git a/wingpanel-indicator-network.spec b/wingpanel-indicator-network.spec
index 81490b1..7290972 100644
--- a/wingpanel-indicator-network.spec
+++ b/wingpanel-indicator-network.spec
@@ -2,26 +2,25 @@
 
 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        2.1.1
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 License:        GPLv3+
 
 URL:            https://github.com/elementary/%{name}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  cmake
 BuildRequires:  gettext
+BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  vala-tools
 
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(libnm-glib)
-BuildRequires:  pkgconfig(libnm-gtk)
-BuildRequires:  pkgconfig(libnm-util)
+BuildRequires:  pkgconfig(libnm)
+BuildRequires:  pkgconfig(libnma)
 BuildRequires:  pkgconfig(wingpanel-2.0)
 
+Requires:       wingpanel%{?_isa}
 Supplements:    wingpanel%{?_isa}
 
 
@@ -34,16 +33,12 @@ A network indicator for wingpanel.
 
 
 %build
-mkdir build && pushd build
-%cmake ..
-%make_build
-popd
+%meson
+%meson_build
 
 
 %install
-pushd build
-%make_install
-popd
+%meson_install
 
 %find_lang network-indicator
 
@@ -54,12 +49,10 @@ popd
 
 %{_libdir}/wingpanel/libnetwork.so
 
-%{_datadir}/glib-2.0/schemas/org.pantheon.desktop.wingpanel.indicators.network.gschema.xml
-
 
 %changelog
-* Sat Nov 04 2017 Fabio Valentini <decathorpe@gmail.com> - 2.1.1-2
-- Rebuild for granite soname bump.
+* Thu Jun 07 2018 Fabio Valentini <decathorpe@gmail.com> - 2.2.0-1
+- Update to version 2.2.0.
 
 * Tue Sep 19 2017 Fabio Valentini <decathorpe@gmail.com> - 2.1.1-1
 - Update to version 2.1.1.

From 668cffd2006ca51a02615c4204f52c988bf3532b Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 3 Oct 2018 15:16:24 +0200
Subject: [PATCH 2/2] update to version 2.2.1

---
 .gitignore                       | 4 ++++
 sources                          | 2 +-
 wingpanel-indicator-network.spec | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc32810..32ed1b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
+/results_*
+/*.src.rpm
+
 /wingpanel-indicator-network-2.0.2.tar.xz
 /wingpanel-indicator-network-2.1.0.tar.gz
 /wingpanel-indicator-network-2.1.1.tar.gz
 /wingpanel-indicator-network-edd2b7a.tar.gz
 /wingpanel-indicator-network-2.2.0.tar.gz
+/wingpanel-indicator-network-2.2.1.tar.gz
diff --git a/sources b/sources
index af1c660..47cc0cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wingpanel-indicator-network-2.2.0.tar.gz) = d9daf4ba2bf1028a3980b4e00f9188d18f979e3bd6b1c4b65905110eb71a0f2ea40fbfe1ebfb5815ea3bf0b7e496939640715bfba276c2ea5db794cad40a3fd0
+SHA512 (wingpanel-indicator-network-2.2.1.tar.gz) = 51a89891adcb3e6091b28225bc66eb646848f0116d12d84ef820745d117a13652da8fa3ad62fb7beed06c7cf86db70f624e8681ce0d2eeb4a7aff3e536654a90
diff --git a/wingpanel-indicator-network.spec b/wingpanel-indicator-network.spec
index 7290972..ff756d0 100644
--- a/wingpanel-indicator-network.spec
+++ b/wingpanel-indicator-network.spec
@@ -2,7 +2,7 @@
 
 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 License:        GPLv3+
 
@@ -51,6 +51,9 @@ A network indicator for wingpanel.
 
 
 %changelog
+* Wed Oct 03 2018 Fabio Valentini <decathorpe@gmail.com> - 2.2.1-1
+- Update to version 2.2.1.
+
 * Thu Jun 07 2018 Fabio Valentini <decathorpe@gmail.com> - 2.2.0-1
 - Update to version 2.2.0.