From 4deea0111ff7bbe6f77ace05cecbfd6f68d1fe18 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 5 Jul 2018 19:56:37 +0200
Subject: [PATCH 1/2] update to version 2.1.0

---
 .gitignore                     |  1 +
 sources                        |  2 +-
 wingpanel-indicator-sound.spec | 27 ++++++++++++++-------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea86b75..fb1d325 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /wingpanel-indicator-sound-2.0.3.tar.xz
 /wingpanel-indicator-sound-2.0.4.tar.gz
 /wingpanel-indicator-sound-2.0.5.tar.gz
+/wingpanel-indicator-sound-2.1.0.tar.gz
diff --git a/sources b/sources
index d584d83..45087ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wingpanel-indicator-sound-2.0.5.tar.gz) = 5661897e48be39173f1dc7c59a65e88ae7e65979550c2121f01cbd6b94ff3f72dadc1728ae0b3b1e5bc3837593b3ab889f29febe243178dc940667e430dfd903
+SHA512 (wingpanel-indicator-sound-2.1.0.tar.gz) = 5be288cc9a5dd5d2f1f04d3ced2d937f500813a2ec73fa30bd8e9bec662df6bce466e1aa548d7b6348e49f47595a54bd2cc28ff6334a75dc31a523131d211294
diff --git a/wingpanel-indicator-sound.spec b/wingpanel-indicator-sound.spec
index 2a0dff1..bcc6ae8 100644
--- a/wingpanel-indicator-sound.spec
+++ b/wingpanel-indicator-sound.spec
@@ -1,18 +1,19 @@
 %global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$
 
+%global appname io.elementary.desktop.wingpanel.sound
+
 Name:           wingpanel-indicator-sound
 Summary:        Sound Indicator for wingpanel
-Version:        2.0.5
-Release:        4%{?dist}
+Version:        2.1.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)
@@ -24,6 +25,7 @@ BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib)
 BuildRequires:  pkgconfig(wingpanel-2.0)
 
+Requires:       wingpanel%{?_isa}
 Supplements:    wingpanel%{?_isa}
 
 
@@ -32,20 +34,16 @@ A sound indicator for wingpanel.
 
 
 %prep
-%autosetup
+%autosetup -p1
 
 
 %build
-mkdir build && pushd build
-%cmake ..
-%make_build
-popd
+%meson
+%meson_build
 
 
 %install
-pushd build
-%make_install
-popd
+%meson_install
 
 %find_lang sound-indicator
 
@@ -56,10 +54,13 @@ popd
 
 %{_libdir}/wingpanel/libsound.so
 
-%{_datadir}/glib-2.0/schemas/org.pantheon.desktop.wingpanel.indicators.sound.gschema.xml
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 
 
 %changelog
+* Thu Jul 05 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.0-1
+- Update to version 2.1.0.
+
 * Sat Nov 04 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.5-4
 - Rebuild for granite soname bump.
 

From 5eacfb44464173a737c19e3642fdd90844668aac Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 1 Oct 2018 16:21:24 +0200
Subject: [PATCH 2/2] update to version 2.1.1

---
 .gitignore                     | 3 +++
 sources                        | 2 +-
 wingpanel-indicator-sound.spec | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb1d325..29d9971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
+/results*
+/*.src.rpm
 /wingpanel-indicator-sound-2.0.3.tar.xz
 /wingpanel-indicator-sound-2.0.4.tar.gz
 /wingpanel-indicator-sound-2.0.5.tar.gz
 /wingpanel-indicator-sound-2.1.0.tar.gz
+/wingpanel-indicator-sound-2.1.1.tar.gz
diff --git a/sources b/sources
index 45087ee..bbd8fd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wingpanel-indicator-sound-2.1.0.tar.gz) = 5be288cc9a5dd5d2f1f04d3ced2d937f500813a2ec73fa30bd8e9bec662df6bce466e1aa548d7b6348e49f47595a54bd2cc28ff6334a75dc31a523131d211294
+SHA512 (wingpanel-indicator-sound-2.1.1.tar.gz) = cebda494293281715eea2cf08fef281669c85a25916a04a8717157267c22bce3a55e5d6be14e8c6c1c19ba9bd135cfc60276541b8407ea3896ef821ba55b0d7c
diff --git a/wingpanel-indicator-sound.spec b/wingpanel-indicator-sound.spec
index bcc6ae8..551bbed 100644
--- a/wingpanel-indicator-sound.spec
+++ b/wingpanel-indicator-sound.spec
@@ -4,7 +4,7 @@
 
 Name:           wingpanel-indicator-sound
 Summary:        Sound Indicator for wingpanel
-Version:        2.1.0
+Version:        2.1.1
 Release:        1%{?dist}
 License:        GPLv3
 
@@ -58,6 +58,9 @@ A sound indicator for wingpanel.
 
 
 %changelog
+* Mon Oct 01 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.1-1
+- Update to version 2.1.1.
+
 * Thu Jul 05 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.0-1
 - Update to version 2.1.0.