[recoll/f13/master] - Add patch to fix #631704

terjeros terjeros at fedoraproject.org
Mon Nov 15 17:16:26 UTC 2010


commit d396e95653635caf3f0b40533fc94ab4885d5cff
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Nov 15 18:16:23 2010 +0100

    - Add patch to fix #631704

 recoll-1.14.2-rclzip.patch |   11 +++++++++++
 recoll.spec                |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/recoll-1.14.2-rclzip.patch b/recoll-1.14.2-rclzip.patch
new file mode 100644
index 0000000..29e96e4
--- /dev/null
+++ b/recoll-1.14.2-rclzip.patch
@@ -0,0 +1,11 @@
+--- recoll-1.14.2/filters/rclzip~	2010-11-15 18:08:04.000000000 +0100
++++ recoll-1.14.2/filters/rclzip	2010-11-15 18:08:21.000000000 +0100
+@@ -19,7 +19,7 @@
+         try:
+             docdata = self.zip.read(ipath)
+             ok = True
+-        except error, err:
++        except Exception, err:
+             self.em.rclog("extractone: failed: [%s]" % err)
+             ok = False
+         iseof = rclexecm.RclExecM.noteof
diff --git a/recoll.spec b/recoll.spec
index 9263feb..1b2f580 100644
--- a/recoll.spec
+++ b/recoll.spec
@@ -1,11 +1,12 @@
 Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
 Version:        1.14.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Applications/Databases
 License:        GPLv2+
 URL:            http://www.lesbonscomptes.com/recoll/
 Source0:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
+Patch0:         recoll-1.14.2-rclzip.patch
 BuildRequires:  qt-devel
 BuildRequires:  zlib-devel
 BuildRequires:  aspell-devel
@@ -22,6 +23,7 @@ interface.
 
 %prep
 %setup -q
+%patch0 -p1
 # remove execute bit
 %{__chmod} 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
 
@@ -78,6 +80,9 @@ exit 0
 %{_mandir}/man5/%{name}.conf.5*
 
 %changelog
+* Mon Nov 15 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.14.2-2
+- Add patch to fix #631704
+
 * Sun Nov  7 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.14.2-1
 - 1.14.2
 


More information about the scm-commits mailing list