From 846e734d7484d4346a1ee88d0d3f6069c014b79d Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr@fedoraproject.org>
Date: Feb 05 2022 21:38:46 +0000
Subject: Merge branch 'rawhide' into f35


---

diff --git a/.gitignore b/.gitignore
index cceedba..d92bd4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /swayidle-1.5.tar.gz
 /swayidle-1.6.tar.gz
 /swayidle-1.7.tar.gz
+/swayidle-1.7.1.tar.gz
+/swayidle-1.7.1.tar.gz.sig
diff --git a/gpgkey-0FDE7BE0E88F5E48.gpg b/gpgkey-0FDE7BE0E88F5E48.gpg
new file mode 100644
index 0000000..3530f32
Binary files /dev/null and b/gpgkey-0FDE7BE0E88F5E48.gpg differ
diff --git a/sources b/sources
index 6ae4d29..961eddd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (swayidle-1.7.tar.gz) = 26a48c510caaadb1ad694426e82880ab1547b7b0ef8ac62a2c2ee41c7b8cc0554f4925b0abdc6dc37f2501a171c0b6ae53c56b045b5c545093f3b0463aefcf24
+SHA512 (swayidle-1.7.1.tar.gz) = 6e0a6eb3b99a415414cac04299392ede9a8263fa5f4a75815742f5fcd4a5badb3021a7ff699a476c04ca2256b85f4149f8c8dda0484306636ffbaccff615d9da
+SHA512 (swayidle-1.7.1.tar.gz.sig) = 23ba5658eeedbe6f6889916c4681490bce4c1ee33ccb805bf019650a5d91a6bd38cd01cdf1b58874e982e786ff72fe47233c7629e6097dd002f616967453cc4e
diff --git a/swayidle-1.7.1-Fix-printf-using-size_t-lineno-variable.patch b/swayidle-1.7.1-Fix-printf-using-size_t-lineno-variable.patch
new file mode 100644
index 0000000..13c7cc7
--- /dev/null
+++ b/swayidle-1.7.1-Fix-printf-using-size_t-lineno-variable.patch
@@ -0,0 +1,22 @@
+From e81d40fca7533f73319e76e42fa9694b21cc9e6e Mon Sep 17 00:00:00 2001
+From: Stacy Harper <contact@stacyharper.net>
+Date: Sat, 15 Jan 2022 17:39:47 +0100
+Subject: [PATCH] Fix printf using size_t lineno variable
+
+---
+ main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index 9ea3f0b3..b524e738 100644
+--- a/main.c
++++ b/main.c
+@@ -1004,7 +1004,7 @@ static int load_config(const char *config_path) {
+ 			parse_idlehint(p.we_wordc, p.we_wordv);
+ 		} else {
+ 			line[i] = 0;
+-			swayidle_log(LOG_ERROR, "Unexpected keyword \"%s\" in line %lu", line, lineno);
++			swayidle_log(LOG_ERROR, "Unexpected keyword \"%s\" in line %zu", line, lineno);
+ 			free(line);
+ 			return -EINVAL;
+ 		}
diff --git a/swayidle.spec b/swayidle.spec
index 0a1b5a8..e3dff30 100644
--- a/swayidle.spec
+++ b/swayidle.spec
@@ -1,14 +1,20 @@
 Name: swayidle
-Version: 1.7
+Version: 1.7.1
 Release: 1%{?dist}
 Summary: An idle daemon for wayland compositors
 
 License: MIT and LGPLv2+
 URL: https://github.com/swaywm/swayidle
-Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz.sig
+# 0FDE7BE0E88F5E48: emersion <contact@emersion.fr>
+Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rkjfnghbjxug6b19#/gpgkey-0FDE7BE0E88F5E48.gpg
+
+Patch0: %{url}/commit/e81d40fca7533f73319e76e42fa9694b21cc9e6e.patch#/swayidle-1.7.1-Fix-printf-using-size_t-lineno-variable.patch
 
 BuildRequires: meson >= 0.48.0
 BuildRequires: gcc
+BuildRequires: gnupg2
 BuildRequires: pkgconfig(wayland-protocols) >= 1.14
 BuildRequires: pkgconfig(wayland-client)
 BuildRequires: pkgconfig(wayland-server)
@@ -19,7 +25,8 @@ BuildRequires: scdoc
 swayidle is an idle management daemon for Wayland compositors.
 
 %prep
-%autosetup
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup -p1
 
 %build
 %meson
@@ -47,6 +54,14 @@ swayidle is an idle management daemon for Wayland compositors.
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sat Feb 05 2022 Aleksei Bavshin <alebastr@fedoraproject.org> - 1.7.1-1
+- Update to 1.7.1 (#2041188)
+- Add source verification
+- Apply upstream patch to fix build on 32-bit architectures
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Aug 19 2021 Jack Hildebrandt <jack@jackhil.de> - 1.7-1
 - Update to 1.7