From a0c4aa8788e7b530f13b3c240e81ce092a7cae0c Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Fri, 31 Jul 2009 12:26:46 +0000
Subject: [PATCH] version 0.997 drop obsolete sane-backends-1.0.20 patch

---
 .cvsignore                             |  2 +-
 sources                                |  2 +-
 xsane-0.996-sane-backends-1.0.20.patch | 15 ---------------
 xsane.spec                             | 14 ++++++++------
 4 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 xsane-0.996-sane-backends-1.0.20.patch

diff --git a/.cvsignore b/.cvsignore
index dc4ae20..504820d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xsane-0.996.tar.gz
+xsane-0.997.tar.gz
diff --git a/sources b/sources
index dfc4a71..b97c103 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7dcbcdf0e83322d7c0a543672d9ca2d8  xsane-0.996.tar.gz
+8377b3e3b792f3d2b7f13895467c7082  xsane-0.997.tar.gz
diff --git a/xsane-0.996-sane-backends-1.0.20.patch b/xsane-0.996-sane-backends-1.0.20.patch
deleted file mode 100644
index e00e852..0000000
--- a/xsane-0.996-sane-backends-1.0.20.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up xsane-0.996/src/xsane-back-gtk.c.sane-backends-1.0.20 xsane-0.996/src/xsane-back-gtk.c
---- xsane-0.996/src/xsane-back-gtk.c.sane-backends-1.0.20	2007-08-13 09:49:34.000000000 +0200
-+++ xsane-0.996/src/xsane-back-gtk.c	2009-07-20 15:22:34.268802179 +0200
-@@ -2612,10 +2612,7 @@ void xsane_back_gtk_set_sensitivity(int 
-       continue;
-     }
- 
--    if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
--    {
--      gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
--    }
-+    gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
-   }
- 
-   if (xsane.xsanemode_widget)
diff --git a/xsane.spec b/xsane.spec
index efd927f..a39acf8 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -4,15 +4,14 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.996
-Release: 10%{?dist}
+Version: 0.997
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
 Patch0: xsane-0.995-xdg-open.patch
 Patch1: xsane-0.995-close-fds.patch
-Patch2: xsane-0.996-sane-backends-1.0.20.patch
-Patch3: xsane-0.996-no-eula.patch
+Patch2: xsane-0.996-no-eula.patch
 License: GPLv2+
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
@@ -56,8 +55,7 @@ done
 
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .close-fds
-%patch2 -p1 -b .sane-backends-1.0.20
-%patch3 -p1 -b .no-eula
+%patch2 -p1 -b .no-eula
 
 %build
 CC='gcc -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"'
@@ -123,6 +121,10 @@ fi
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Fri Jul 31 2009 Nils Philippsen <nils@redhat.com> 0.997-1
+- version 0.997
+- drop obsolete sane-backends-1.0.20 patch
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.996-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild