rdieter pushed to calligra (f22). "2.9.4, BR: s/marble-devel/marble-widget-devel/"

[notifications at fedoraproject.org]

From 0ebfda14ebd74020dd7060f29bb436fd5a6823d4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 7 May 2015 13:28:18 -0500
Subject: 2.9.4, BR: s/marble-devel/marble-widget-devel/


diff --git a/.gitignore b/.gitignore
index 6a0da11..4891c1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/calligra-2.9.2.tar.xz
+/calligra-2.9.4.tar.xz
diff --git a/calligra.spec b/calligra.spec
index 03f4208..501a1a5 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -28,8 +28,8 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Name:    calligra 
-Version: 2.9.2
-Release: 4%{?dist}
+Version: 2.9.4
+Release: 1%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -50,7 +50,6 @@ 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
 
@@ -85,7 +84,7 @@ BuildRequires: pkgconfig(gl) pkgconfig(glu)
 BuildRequires: pkgconfig(libkactivities)
 BuildRequires: libjpeg-devel
 %if 0%{?marble}
-BuildRequires: marble-devel
+BuildRequires: marble-widget-devel
 %endif
 %if 0%{?wpd}
 %if 0%{?revenge}
@@ -511,7 +510,6 @@ Requires: %{name}-core = %{version}-%{release}
 %prep
 %setup -q
 
-%patch50 -p1 -b .fix_csv_import
 %patch2 -p1 -b .disable_products
 
 ## kdchart munging begin
@@ -1300,6 +1298,9 @@ fi
 
 
 %changelog
+* Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-1
+- 2.9.4, BR: s/marble-devel/marble-widget-devel/
+
 * Mon Apr 20 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.2-4
 - kexi-libs: Requires: kate4-part (#1213229, kde#346373)
 
diff --git a/fix_csv_import.patch b/fix_csv_import.patch
deleted file mode 100644
index 175508f..0000000
--- a/fix_csv_import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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)) {
diff --git a/sources b/sources
index 7f8f02b..874d23b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a293d85b288468c14c8638ad0dc37947  calligra-2.9.2.tar.xz
+12bf6bd00de3d7b589c1b1cfebca8f91  calligra-2.9.4.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=f22&id=0ebfda14ebd74020dd7060f29bb436fd5a6823d4