[calligra] calligra-2.4.91
Rex Dieter
rdieter at fedoraproject.org
Sat Jun 16 12:23:22 UTC 2012
commit 5df788d76fecb881c138b6d8f872407698e2c72f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Jun 16 07:22:10 2012 -0500
calligra-2.4.91
.gitignore | 2 +-
calligra-2.4.90-tables_to_sheets.patch | 50 --------------------------------
calligra-2.4.91-tables_to_sheets.patch | 50 ++++++++++++++++++++++++++++++++
calligra.spec | 26 ++++++++--------
sources | 2 +-
5 files changed, 65 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c67f17d..81af3e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/calligra-2.4.2.tar.bz2
-/calligra-2.4.90.tar.bz2
+/calligra-2.4.91.tar.bz2
diff --git a/calligra-2.4.91-tables_to_sheets.patch b/calligra-2.4.91-tables_to_sheets.patch
new file mode 100644
index 0000000..8a25c9f
--- /dev/null
+++ b/calligra-2.4.91-tables_to_sheets.patch
@@ -0,0 +1,50 @@
+diff -up calligra-2.4.91/plugins/staging/googledocs/CMakeLists.txt.tables_to_sheets calligra-2.4.91/plugins/staging/googledocs/CMakeLists.txt
+--- calligra-2.4.91/plugins/staging/googledocs/CMakeLists.txt.tables_to_sheets 2012-06-15 12:11:08.000000000 -0500
++++ calligra-2.4.91/plugins/staging/googledocs/CMakeLists.txt 2012-06-15 21:53:25.945071659 -0500
+@@ -33,7 +33,7 @@ install(TARGETS calligragoogledocs DEST
+ ########### install files ###############
+
+ install( FILES googledocs-stage.rc DESTINATION ${DATA_INSTALL_DIR}/stage/kpartplugins)
+-install( FILES googledocs-sheets.rc DESTINATION ${DATA_INSTALL_DIR}/tables/kpartplugins)
++install( FILES googledocs-sheets.rc DESTINATION ${DATA_INSTALL_DIR}/sheets/kpartplugins)
+ install( FILES googledocs-words.rc DESTINATION ${DATA_INSTALL_DIR}/words/kpartplugins)
+
+
+diff -up calligra-2.4.91/plugins/staging/googledocs/googledocumentservice.cpp.tables_to_sheets calligra-2.4.91/plugins/staging/googledocs/googledocumentservice.cpp
+--- calligra-2.4.91/plugins/staging/googledocs/googledocumentservice.cpp.tables_to_sheets 2012-06-15 12:11:08.000000000 -0500
++++ calligra-2.4.91/plugins/staging/googledocs/googledocumentservice.cpp 2012-06-15 21:52:31.298754832 -0500
+@@ -88,7 +88,7 @@ void GoogleDocumentService::listDocument
+ case OnlineDocument::STAGE:
+ url = "https://docs.google.com/feeds/default/private/full/-/presentation";
+ break;
+- case OnlineDocument::TABLES:
++ case OnlineDocument::SHEETS:
+ url = "https://docs.google.com/feeds/default/private/full/-/spreadsheet";
+ break;
+ }
+diff -up calligra-2.4.91/plugins/staging/googledocs/onlinedocument.cpp.tables_to_sheets calligra-2.4.91/plugins/staging/googledocs/onlinedocument.cpp
+--- calligra-2.4.91/plugins/staging/googledocs/onlinedocument.cpp.tables_to_sheets 2012-06-15 12:11:08.000000000 -0500
++++ calligra-2.4.91/plugins/staging/googledocs/onlinedocument.cpp 2012-06-15 21:52:31.298754832 -0500
+@@ -56,8 +56,8 @@ OnlineDocument::OnlineDocument(QObject *
+ m_type = OnlineDocument::WORDS;
+ } else if (name.contains("stage")) {
+ m_type = OnlineDocument::STAGE;
+- } else if (name.contains("tables")) {
+- m_type = OnlineDocument::TABLES;
++ } else if (name.contains("sheets")) {
++ m_type = OnlineDocument::SHEETS;
+ } else {
+ m_type = OnlineDocument::UNKNOWN;
+ }
+diff -up calligra-2.4.91/plugins/staging/googledocs/onlinedocument.h.tables_to_sheets calligra-2.4.91/plugins/staging/googledocs/onlinedocument.h
+--- calligra-2.4.91/plugins/staging/googledocs/onlinedocument.h.tables_to_sheets 2012-06-15 12:11:08.000000000 -0500
++++ calligra-2.4.91/plugins/staging/googledocs/onlinedocument.h 2012-06-15 21:52:31.299754820 -0500
+@@ -31,7 +31,7 @@ public:
+ enum DocumentType {
+ WORDS,
+ STAGE,
+- TABLES,
++ SHEETS,
+ UNKNOWN
+ };
+
diff --git a/calligra.spec b/calligra.spec
index 06f5371..073ca31 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -6,14 +6,13 @@
%define GTL 1
%endif
-%if 0%{?fedora} < 18
-# seems busted with marble-4.8.80+ -- rex
+#if 0%{?fedora} < 18
%define marble 1
-%endif
+#endif
Name: calligra
-Version: 2.4.90
-Release: 2%{?dist}
+Version: 2.4.91
+Release: 1%{?dist}
Summary: An integrated office suite
License: GPLv2+ and LGPLv2+
@@ -21,9 +20,9 @@ URL: http://www.calligra-suite.org/
Source0: http://download.kde.org/stable/calligra-%{version}/calligra-%{version}.tar.bz2
## upstreamable patches
-Patch50: calligra-2.4.90-tables_to_sheets.patch
## upstream patches
+Patch100: calligra-2.4.91-tables_to_sheets.patch
BuildRequires: boost-devel
BuildRequires: bzip2-devel bzip2
@@ -436,9 +435,7 @@ popd
## kdchart munging end
# rename sheets to tables
-%patch50 -p1 -b .tables_to_sheets
-mv plugins/staging/googledocs/googledocs-tables.rc \
- plugins/staging/googledocs/googledocs-sheets.rc
+%patch100 -p1 -b .tables_to_sheets
%build
@@ -656,10 +653,10 @@ fi
%{_kde4_libdir}/libkowidgets.so.*
%{_kde4_libdir}/libkowv2.so.9*
%{_kde4_libdir}/libkformulalib.so.*
-%{_kde4_libdir}/libkundo2.so.9*
+%{_kde4_libdir}/libkundo2.so.*
%{_kde4_libdir}/libmsooxml.so.*
%{_kde4_libdir}/libpigmentcms.so.*
-%{_kde4_libdir}/libRtfReader.so.9*
+%{_kde4_libdir}/libRtfReader.so.*
%{_kde4_libdir}/libtextlayout.so.*
%{_kde4_libdir}/liblibwmf.so.*
@@ -684,7 +681,7 @@ fi
%{_kde4_includedir}/words/
%files kdchart
-%{_kde4_libdir}/libkdchart.so.9*
+%{_kde4_libdir}/libkdchart.so.10*
%files kdchart-devel
%{_kde4_libdir}/libkdchart.so
@@ -712,7 +709,7 @@ fi
%postun braindump-libs -p /sbin/ldconfig
%files braindump-libs
-%{_kde4_libdir}/libbraindumpcore.so.9*
+%{_kde4_libdir}/libbraindumpcore.so.*
%if 0%{?kformula}
%files kformula
@@ -1093,6 +1090,9 @@ fi
%changelog
+* Fri Jun 15 2012 Rex Dieter <rdieter at fedoraproject.org> 2.4.91-1
+- calligra-2.4.91
+
* Wed Jun 06 2012 Rex Dieter <rdieter at fedoraproject.org> 2.4.90-2
- fix kexi-map-form-widget Requires/Obsoletes logic
diff --git a/sources b/sources
index 55ad9ff..0a454f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c91b51b1bea98119c4caed33939bd06 calligra-2.4.90.tar.bz2
+174d034fe15a1b72e6a9c84603e1d70a calligra-2.4.91.tar.bz2
More information about the scm-commits
mailing list