rpms/gscan2pdf/devel gscan2pdf-unknown-message.patch, NONE, 1.1 gscan2pdf.spec, 1.35, 1.36

[Bernard Johnson]

Author: bjohnson

Update of /cvs/pkgs/rpms/gscan2pdf/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2525/devel

Modified Files:
	gscan2pdf.spec 
Added Files:
	gscan2pdf-unknown-message.patch 
Log Message:
- patch for "Unknown message" window alerts while scanning (bz #571761)


gscan2pdf-unknown-message.patch:
 scanimage-perl |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gscan2pdf-unknown-message.patch ---
diff --git a/bin/scanimage-perl b/bin/scanimage-perl
index f3e2641..cd95d94 100755
--- a/bin/scanimage-perl
+++ b/bin/scanimage-perl
@@ -1173,16 +1173,19 @@ $SIG{PIPE} = \&sighandler;
 $SIG{TERM} = \&sighandler;
 
 $batch_increment = 2 if ($batch_double);
+$batch = 1 if (defined $format);
 if ($batch_count) {
  $batch = 1;
 }
 elsif ($batch) {
  $batch_count = -1;
 }
+else {
+ $batch_count = 1;
+}
 
 if ($test == 0) {
  my $n = $batch_start_at;
- $batch = 1 if (defined $format);
 
  if ($batch && (! defined($format) || $format eq '')) {
 #  if ($output_format == OUTPUT_TIFF) {
-- 
1.6.3



Index: gscan2pdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gscan2pdf/devel/gscan2pdf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gscan2pdf.spec	12 Feb 2010 23:43:24 -0000	1.35
+++ gscan2pdf.spec	8 Apr 2010 03:40:49 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           gscan2pdf
 Version:        0.9.30
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GUI for producing a multipage PDF from a scan
 
 Group:          Applications/Publishing
@@ -8,6 +8,7 @@ License:        GPLv3
 URL:            http://gscan2pdf.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Temporary patch until next release when this will be resolved
+Patch0:         gscan2pdf-unknown-message.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -26,6 +27,8 @@ A GUI to ease the process of producing a
 %prep
 %setup -q
 
+%patch0 -p1 -b .unknown-message-window
+
 # fix file that is not UTF-8
 iconv --from=ISO-8859-1 --to=UTF-8 History > History.new
 mv History.new History
@@ -80,6 +83,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Apr 07 2010 Bernard Johnson <bjohnson at symetrix.com> - 0.9.30-3
+- patch for "Unknown message" window alerts while scanning (bz #571761)
+
 * Fri Feb 12 2010 Bernard Johnson <bjohnson at symetrix.com> - 0.9.30-2
 - missed dependency: perl(Set::IntSpan) (bz #563339)
 - convert History to UTF-8