rpms/xsane/devel xsane-0.99-medium-definitions.patch, NONE, 1.1 xsane.spec, 1.30, 1.31 xsane-medium-definitions.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29336

Modified Files:
	xsane.spec 
Added Files:
	xsane-0.99-medium-definitions.patch 
Removed Files:
	xsane-medium-definitions.patch 
Log Message:
fix medium-definitions patch to not barf on obsolete options in config file (#185269, by Aldy Hernandez)


xsane-0.99-medium-definitions.patch:
 xsane-preferences.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xsane-0.99-medium-definitions.patch ---
--- xsane-0.99/src/xsane-preferences.c.medium-definitions	2005-12-29 12:18:09.000000000 +0100
+++ xsane-0.99/src/xsane-preferences.c	2006-04-04 17:53:11.000000000 +0200
@@ -446,6 +446,13 @@
       {
         break;
       }
+      else if (!strcmp(name, "medium-definitions"))
+      {
+        /* Ignore medium_definitions */
+        SANE_Word discard;
+        xsane_rc_io_w_space(&w, 3);
+        xsane_rc_io_w_word(&w, &discard);
+      }
       else if (i == NELEMS(desc))
       {
         DBG(DBG_info2, "preferences identifier %s unknown\n", name);


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xsane.spec	11 Feb 2006 06:33:50 -0000	1.30
+++ xsane.spec	4 Apr 2006 16:02:28 -0000	1.31
@@ -1,11 +1,11 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 2.2
+Release: 3
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
-Patch1: xsane-medium-definitions.patch
+Patch1: xsane-0.99-medium-definitions.patch
 Patch2: xsane-0.92_gimp2.0.patch
 Patch3: xsane-0.99-buffer.patch
 License: GPL
@@ -97,6 +97,10 @@
 exit 0
 
 %changelog
+* Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-3
+- fix medium-definitions patch to not barf on obsolete options in config file
+  (#185269, by Aldy Hernandez)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99-2.2
 - bump again for double-long bug on ppc(64)
 


--- xsane-medium-definitions.patch DELETED ---