rdieter pushed to calligra (f21). "backport "fix csv import" (kde#344718)"

[notifications at fedoraproject.org]

>From 1b750dea107c041a09300bd7462804d10e398838 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 6 Apr 2015 17:12:55 -0500
Subject: backport "fix csv import" (kde#344718)


diff --git a/calligra.spec b/calligra.spec
index 0d94f89..bb8f46a 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -29,7 +29,7 @@
 
 Name:    calligra 
 Version: 2.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -50,6 +50,7 @@ Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{versio
 Patch2: calligra-2.9.0-disable_products.patch
 
 ## upstream patches
+Patch50: fix_csv_import.patch
 
 ## upstreamable patches
 
@@ -506,6 +507,7 @@ Requires: %{name}-core = %{version}-%{release}
 %prep
 %setup -q
 
+%patch50 -p1 -b .fix_csv_import
 %patch2 -p1 -b .disable_products
 
 ## kdchart munging begin
@@ -1294,6 +1296,9 @@ fi
 
 
 %changelog
+* Mon Apr 06 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.2-2
+- backport "fix csv import" (kde#344718)
+
 * Fri Apr 03 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.2-1
 - 2.9.2
 
diff --git a/fix_csv_import.patch b/fix_csv_import.patch
new file mode 100644
index 0000000..175508f
--- /dev/null
+++ b/fix_csv_import.patch
@@ -0,0 +1,27 @@
+commit 88c16915f0c717d1325e3035ae85266c7297a0b1
+Author: Tomas Mecir <mecirt at gmail.com>
+Date:   Mon Apr 6 20:48:46 2015 +0200
+
+    fix csv import
+    
+    BUG: 344718
+
+diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc
+index 94d53f1..f57de28 100644
+--- a/filters/sheets/csv/csvimport.cc
++++ b/filters/sheets/csv/csvimport.cc
+@@ -83,10 +83,10 @@ KoFilter::ConversionStatus CSVFilter::convert(const QByteArray& from, const QByt
+ 
+     Doc *ksdoc = static_cast<Doc *>(document);   // type checked above
+ 
+-    if (ksdoc->mimeType() != "application/vnd.oasis.opendocument.spreadsheet") {
+-        kWarning(30501) << "Invalid document mimetype " << ksdoc->mimeType();
+-        return KoFilter::NotImplemented;
+-    }
++//    if (ksdoc->mimeType() != "application/vnd.oasis.opendocument.spreadsheet") {
++//       kWarning(30501) << "Invalid document mimetype " << ksdoc->mimeType();
++//        return KoFilter::NotImplemented;
++//    }
+ 
+     QFile in(file);
+     if (!in.open(QIODevice::ReadOnly)) {
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=f21&id=1b750dea107c041a09300bd7462804d10e398838