From 9782586384cca6281ba864f767c0ba34563c8a4e Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 23 Mar 2021 17:21:08 +0100
Subject: [PATCH] Update to 40.0

---
 .gitignore                                    |  1 +
 ...se-tilde-for-pre-releases-in-appdata.patch | 25 -------------------
 simple-scan.spec                              |  8 +++---
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 0001-Use-tilde-for-pre-releases-in-appdata.patch

diff --git a/.gitignore b/.gitignore
index 8f7667f..3a8978b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,4 @@ simple-scan-2.31.5.tar.bz2
 /simple-scan-3.38.2.tar.xz
 /simple-scan-40.beta.tar.xz
 /simple-scan-40.tar.xz
+/simple-scan-40.0.tar.xz
diff --git a/0001-Use-tilde-for-pre-releases-in-appdata.patch b/0001-Use-tilde-for-pre-releases-in-appdata.patch
deleted file mode 100644
index 4643903..0000000
--- a/0001-Use-tilde-for-pre-releases-in-appdata.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 486924752c0df8c6d20364c8b29b20b0af3b2ebd Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Mon, 22 Mar 2021 23:59:08 +0100
-Subject: [PATCH] Use tilde for pre-releases in appdata
-
----
- data/simple-scan.appdata.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in
-index 3b0267f..469293b 100644
---- a/data/simple-scan.appdata.xml.in
-+++ b/data/simple-scan.appdata.xml.in
-@@ -32,7 +32,7 @@
-         </p>
-       </description>
-     </release>
--    <release date="2021-02-25" version="40.beta" type="development">
-+    <release date="2021-02-25" version="40~beta" type="development">
-       <description>
-         <p>
-           This is an unstable release in the 40 development series,
--- 
-2.30.2
-
diff --git a/simple-scan.spec b/simple-scan.spec
index 5355e55..7ed42a7 100644
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -1,16 +1,13 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           simple-scan
-Version:        40
+Version:        40.0
 Release:        1%{?dist}
 Summary:        Simple scanning utility
 
 License:        GPLv3+
 URL:            https://launchpad.net/%{name}
 Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
-# Work around releases going backwards in appdata
-# https://gitlab.gnome.org/GNOME/simple-scan/-/issues/231
-Patch0:         0001-Use-tilde-for-pre-releases-in-appdata.patch
 
 BuildRequires:  meson
 BuildRequires:  sane-backends-devel
@@ -60,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
 
 %changelog
+* Tue Mar 23 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+
 * Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40-1
 - Update to 40
 
diff --git a/sources b/sources
index 6a5a6c2..683b20e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (simple-scan-40.tar.xz) = e621e6ba72014dac34b3d41a943a70fe1d6bd4a8ba30c6c9bbab613d6d553316aa4c47d67dd2c4154279bba41dc4128dc013ca6fe99fa5329dd8678541c390ee
+SHA512 (simple-scan-40.0.tar.xz) = 978c11b789219cb08a961b1bc1428150d023e823ee1f7fd39a3bee714f0079e25559a918ef98f42a464f8a22f4a93a59893b7b4c054dc28d343479d3fc593d8a