[calligra/f18] bring back piece of tables_to_sheets.patch
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 28 04:07:54 UTC 2012
commit bcb411b353827dc5f0692f0f56b67d3e9123ec8c
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Dec 27 22:07:59 2012 -0600
bring back piece of tables_to_sheets.patch
calligra-2.5.4-tables_to_sheets.patch | 12 ++++++++++++
calligra.spec | 5 +++++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/calligra-2.5.4-tables_to_sheets.patch b/calligra-2.5.4-tables_to_sheets.patch
new file mode 100644
index 0000000..b32bd5a
--- /dev/null
+++ b/calligra-2.5.4-tables_to_sheets.patch
@@ -0,0 +1,12 @@
+diff -up calligra-2.5.4/plugins/staging/googledocs/CMakeLists.txt.tables_to_sheets calligra-2.5.4/plugins/staging/googledocs/CMakeLists.txt
+--- calligra-2.5.4/plugins/staging/googledocs/CMakeLists.txt.tables_to_sheets 2012-11-17 06:58:15.000000000 -0600
++++ calligra-2.5.4/plugins/staging/googledocs/CMakeLists.txt 2012-12-27 22:06:46.985253689 -0600
+@@ -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 --git a/calligra.spec b/calligra.spec
index d90e04a..75ae16b 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -27,6 +27,9 @@ URL: http://www.calligra-suite.org/
%endif
Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{version}.tar.bz2
+## upstreamable patches
+Patch50: calligra-2.5.4-tables_to_sheets.patch
+
BuildRequires: boost-devel
BuildRequires: bzip2-devel bzip2
BuildRequires: desktop-file-utils
@@ -427,6 +430,8 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
%prep
%setup -q
+%patch50 -p1 -b .tables_to_sheets
+
## kdchart munging begin
pushd plugins/chartshape/kdchart
mv src kdchart
More information about the scm-commits
mailing list