From 054079ae867fd8a92a531c4e3b07c9519319e13a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 27 Apr 2020 12:41:10 +0200
Subject: [PATCH] + switcheroo-control-2.2-1 Update to 2.2

---
 .gitignore              |  1 +
 sources                 |  2 +-
 switcheroo-control.spec | 21 +++++++++++++++------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index f906582..865ae16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /switcheroo-control-1.3.1.tar.xz
 /switcheroo-control-2.0.tar.xz
 /switcheroo-control-2.1.tar.xz
+/switcheroo-control-2.2.tar.xz
diff --git a/sources b/sources
index 59c7b1d..016c505 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (switcheroo-control-2.1.tar.xz) = 51641082553a186ba279bade5c6172db9e2250689a8a89b6ec0b5abf7831a030afef38101450724df78ca8203cd0f37277a6ba649b46fff7f746b6049a781189
+SHA512 (switcheroo-control-2.2.tar.xz) = 37ad3760c5d98a8fed2c8e172eed70864d426921da610b2921551e42e2c9a6d417ca5eefb867e3880742e10cffe0e61bffa6a95437e0a0deaec69a6b84e67d78
diff --git a/switcheroo-control.spec b/switcheroo-control.spec
index 344554c..1f8a9c3 100644
--- a/switcheroo-control.spec
+++ b/switcheroo-control.spec
@@ -1,17 +1,18 @@
 Name:           switcheroo-control
-Version:        2.1
-Release:        2%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        D-Bus service to check the availability of dual-GPU
 
 License:        GPLv3
 URL:            https://gitlab.freedesktop.org/hadess/switcheroo-control/
 # URL from https://gitlab.freedesktop.org/hadess/switcheroo-control/-/releases
-Source0:        https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/ab003d6cde3708a2250e0b83d895acb3/switcheroo-control-2.1.tar.xz
+Source0:        https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/88210ff234d8f6698bdfa17c87bc3480/switcheroo-control-2.2.tar.xz
 
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  gtk-doc
+BuildRequires:  meson
 BuildRequires:  systemd
 
 %{?systemd_requires}
@@ -32,13 +33,15 @@ This package contains the documentation for %{name}.
 
 
 %build
-%configure
-%make_build
+%meson -Dgtk_doc=true
+%meson_build
 
 
 %install
-%make_install
+%meson_install
 
+# https://gitlab.freedesktop.org/hadess/switcheroo-control/-/merge_requests/32
+sed -i 's,/bin/python,/bin/python3,' %{buildroot}/%{_bindir}/switcherooctl
 
 %post
 if [ $1 -eq 2 ] && [ -x /usr/bin/systemctl ] ; then
@@ -57,10 +60,12 @@ fi
 %files
 %license COPYING
 %doc NEWS README.md
+%{_bindir}/switcherooctl
 %{_sysconfdir}/dbus-1/system.d/net.hadess.SwitcherooControl.conf
 %{_unitdir}/switcheroo-control.service
 %{_libexecdir}/switcheroo-control
 %{_udevhwdbdir}/30-pci-intel-gpu.hwdb
+%{_mandir}/man1/switcherooctl.1*
 
 %files docs
 %dir %{_datadir}/gtk-doc/
@@ -68,6 +73,10 @@ fi
 %{_datadir}/gtk-doc/html/%{name}/
 
 %changelog
+* Mon Apr 27 2020 Bastien Nocera <bnocera@redhat.com> - 2.2-1
++ switcheroo-control-2.2-1
+- Update to 2.2
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild