From 8d190f557bcf95b72fa4a63707806f6f0e3d7432 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 23 May 2017 08:22:59 +0100
Subject: [PATCH] Update to 3.25.2

---
 .gitignore                               |  1 +
 simple-scan-3.25.1-fix-vala-syntax.patch | 21 ---------------------
 simple-scan.spec                         |  9 +++++----
 sources                                  |  2 +-
 4 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 simple-scan-3.25.1-fix-vala-syntax.patch

diff --git a/.gitignore b/.gitignore
index ff0ed30..40d6503 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ simple-scan-2.31.5.tar.bz2
 /simple-scan-3.23.90.tar.xz
 /simple-scan-3.24.0.tar.xz
 /simple-scan-3.25.1.tar.xz
+/simple-scan-3.25.2.tar.xz
diff --git a/simple-scan-3.25.1-fix-vala-syntax.patch b/simple-scan-3.25.1-fix-vala-syntax.patch
deleted file mode 100644
index 28a6f46..0000000
--- a/simple-scan-3.25.1-fix-vala-syntax.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN simple-scan-3.25.1.old/src/ui.vala simple-scan-3.25.1/src/ui.vala
---- simple-scan-3.25.1.old/src/ui.vala	2017-04-25 04:10:18.000000000 +0100
-+++ simple-scan-3.25.1/src/ui.vala	2017-04-25 13:38:49.425811115 +0100
-@@ -467,7 +467,7 @@
-                 for (i = 0; i < n_delete; i++)
-                 {
-                     device_model.iter_nth_child (out iter, null, index);
--                    device_model.remove (iter);
-+                    device_model.remove (ref iter);
-                 }
-             }
-             else
-@@ -480,7 +480,7 @@
- 
-         /* Remove any remaining devices */
-         while (device_model.iter_nth_child (out iter, null, index))
--            device_model.remove (iter);
-+            device_model.remove (ref iter);
- 
-         /* Select the previously selected device or the first available device */
-         if (!have_selection)
diff --git a/simple-scan.spec b/simple-scan.spec
index 023317e..c85c7ea 100644
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -1,13 +1,11 @@
 Name:           simple-scan
-Version:        3.25.1
+Version:        3.25.2
 Release:        1%{?dist}
 Summary:        Simple scanning utility
 
 License:        GPLv3+
 URL:            https://launchpad.net/%{name}
-Source0:        %{url}/3.25/%{version}/+download/%{name}-%{version}.tar.xz
-# https://bugs.launchpad.net/simple-scan/+bug/1686083
-Patch0:         simple-scan-3.25.1-fix-vala-syntax.patch
+Source0:        https://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz
 
 BuildRequires:  meson
 BuildRequires:  sane-backends-devel
@@ -65,6 +63,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
 
 %changelog
+* Tue May 23 2017 David King <amigadave@amigadave.com> - 3.25.2-1
+- Update to 3.25.2
+
 * Tue Apr 25 2017 David King <amigadave@amigadave.com> - 3.25.1-1
 - Update to 3.25.1
 
diff --git a/sources b/sources
index 8d48f51..2b5779b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (simple-scan-3.25.1.tar.xz) = cd0166aa6dc0d0357180f7bd730463138be3b5f00b9e5f5b42e44b63460985696a8f06c84a2f02844f1a5e083b95628a013b588cb4d7b7ddfcac02865bf04b64
+SHA512 (simple-scan-3.25.2.tar.xz) = d705a3c391e80b6b5924b7156c818c5a89976aad73c549b3a2830d2de58d62df2bebf0b4ddbaca37ac284cc56c0aa40fd9209ffe6be41863a4c2f0c42493a312