[calligra] 2.3.92 (2.4rc2)
Rex Dieter
rdieter at fedoraproject.org
Sun Mar 18 20:26:12 UTC 2012
commit ce36c1e00e5b2c6599b7796ec86483d7fa2c6c18
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Mar 18 15:27:59 2012 -0500
2.3.92 (2.4rc2)
- rename -tables => -sheets
.gitignore | 1 +
calligra-2.3.92-tables_to_sheets.patch | 31 ++++++++++++++
calligra.spec | 70 ++++++++++++++++++--------------
sources | 2 +-
4 files changed, 73 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e7fe2dc..5f45fa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/calligra-2.3.91.tar.bz2
+/calligra-2.3.92.tar.bz2
diff --git a/calligra-2.3.92-tables_to_sheets.patch b/calligra-2.3.92-tables_to_sheets.patch
new file mode 100644
index 0000000..f41287e
--- /dev/null
+++ b/calligra-2.3.92-tables_to_sheets.patch
@@ -0,0 +1,31 @@
+diff -up calligra-2.3.92/sheets/plugins/scripting/scripts/CMakeLists.txt.tables_to_sheets calligra-2.3.92/sheets/plugins/scripting/scripts/CMakeLists.txt
+--- calligra-2.3.92/sheets/plugins/scripting/scripts/CMakeLists.txt.tables_to_sheets 2012-03-16 13:12:48.000000000 -0500
++++ calligra-2.3.92/sheets/plugins/scripting/scripts/CMakeLists.txt 2012-03-18 15:25:53.478480452 -0500
+@@ -1,6 +1,6 @@
+ install(FILES
+ scripts.rc
+- DESTINATION ${DATA_INSTALL_DIR}/tables/scripts)
++ DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts)
+
+ install(FILES
+ csvimport.py csvexport.py csvoptions.ui
+@@ -11,16 +11,16 @@ install(FILES
+ logger.py
+ xmlviewer.py
+ myorca.py
+- DESTINATION ${DATA_INSTALL_DIR}/tables/scripts/extensions)
++ DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/extensions)
+
+ install(FILES
+ functions.py
+ rpyfunctions.py
+ yfinance.py yweather.py
+ pytime.py pyregexp.py
+- DESTINATION ${DATA_INSTALL_DIR}/tables/scripts/functions)
++ DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/functions)
+
+ install(FILES
+ consoledocker.py
+ snippetsdocker.rb
+- DESTINATION ${DATA_INSTALL_DIR}/tables/scripts/docker)
++ DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/docker)
diff --git a/calligra.spec b/calligra.spec
index 48421a0..8ab52f0 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -7,7 +7,7 @@
%endif
Name: calligra
-Version: 2.3.91
+Version: 2.3.92
Release: 1%{?dist}
Summary: An integrated office suite
@@ -16,7 +16,10 @@ URL: http://www.calligra-suite.org/
Source0: http://download.kde.org/unstable/calligra-%{version}/calligra-%{version}.tar.bz2
## upstreamable patches
+# fix FTBFS with gcc-4.7
Patch50: calligra-2.3.87-gcc47.patch
+# scripts missed tables->sheets rename
+Patch51: calligra-2.3.92-tables_to_sheets.patch
## upstream patches
@@ -78,7 +81,7 @@ Obsoletes: koffice-suite < %{koffice_ver}
Requires: %{name}-braindump = %{version}-%{release}
Requires: %{name}-words = %{version}-%{release}
-Requires: %{name}-tables = %{version}-%{release}
+Requires: %{name}-sheets = %{version}-%{release}
Requires: %{name}-stage = %{version}-%{release}
Requires: %{name}-flow = %{version}-%{release}
Requires: %{name}-karbon = %{version}-%{release}
@@ -193,20 +196,22 @@ Requires: %{name}-words = %{version}-%{release}
%description words-libs
%{summary}.
-%package tables
+%package sheets
Summary: A fully-featured spreadsheet application
Obsoletes: koffice-kspread < %{koffice_ver}
Obsoletes: koffice-kspread-libs < %{koffice_ver}
+Obsoletes: calligra-tables < 2.3.92
Requires: %{name}-core = %{version}-%{release}
-%description tables
+%description sheets
Tables is a fully-featured calculation and spreadsheet tool. Use it to
quickly create and calculate various business-related spreadsheets, such
as income and expenditure, employee working hours…
-%package tables-libs
-Summary: Runtime libraries for %{name}-tables
-Requires: %{name}-tables = %{version}-%{release}
-%description tables-libs
+%package sheets-libs
+Summary: Runtime libraries for %{name}-sheets
+Obsoletes: calligra-tables-libs < 2.3.92
+Requires: %{name}-sheets = %{version}-%{release}
+%description sheets-libs
%{summary}.
%package stage
@@ -354,7 +359,7 @@ Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
%package kexi-spreadsheet-import
Summary: Spreadsheet-to-Kexi-table import plugin
-Requires: %{name}-tables-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-sheets-libs%{?_isa} = %{version}-%{release}
%description kexi-spreadsheet-import
%{summary}.
@@ -405,6 +410,7 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
%setup -q
%patch50 -p1 -b .gcc47
+%patch51 -p1 -b .tables_to_sheets
## kdchart munging begin
pushd plugins/chartshape/kdchart
@@ -670,7 +676,7 @@ fi
%{_kde4_libdir}/libkformdesigner.so
%{_kde4_includedir}/stage/
%{_kde4_includedir}/styles/
-%{_kde4_includedir}/tables/
+%{_kde4_includedir}/sheets/
%{_kde4_includedir}/words/
%files kdchart
@@ -732,19 +738,19 @@ fi
%{_kde4_libdir}/kde4/koreport_mapsplugin.so
%{_kde4_datadir}/kde4/services/koreport_mapsplugin.desktop
-%posttrans tables
+%posttrans sheets
update-desktop-database -q &> /dev/null ||:
-%postun tables
+%postun sheets
if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null ||:
fi
-%files tables
-%{_kde4_bindir}/calligratables
-%{_kde4_libdir}/libkdeinit4_calligratables.so
-%{_kde4_libdir}/libcalligratablesodf.so
-%{_kde4_libdir}/kde4/calligratables*.so
+%files sheets
+%{_kde4_bindir}/calligrasheets
+%{_kde4_libdir}/libkdeinit4_calligrasheets.so
+%{_kde4_libdir}/libcalligrasheetsodf.so
+%{_kde4_libdir}/kde4/calligrasheets*.so
%{_kde4_libdir}/kde4/applixspreadimport.*
%{_kde4_libdir}/kde4/csvexport.*
%{_kde4_libdir}/kde4/csvimport.*
@@ -763,29 +769,29 @@ fi
%{_kde4_libdir}/kde4/kspread_plugin_tool_calendar.so
%{_kde4_libdir}/kde4/kspreadsolver.so
%{_kde4_libdir}/kde4/spreadsheetshape-deferred.so
-%{_kde4_appsdir}/tables/
-%{_kde4_configdir}/tablesrc
-%{_kde4_datadir}/config.kcfg/tables.kcfg
+%{_kde4_appsdir}/sheets/
+%{_kde4_configdir}/sheetsrc
+%{_kde4_datadir}/config.kcfg/sheets.kcfg
%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
%{_kde4_datadir}/kde4/services/kspread_plugin_tool_calendar.desktop
%{_kde4_datadir}/kde4/services/kspread*module.desktop
%{_kde4_datadir}/kde4/services/kspread_*_export.desktop
%{_kde4_datadir}/kde4/services/kspread_*_import.desktop
%{_kde4_datadir}/kde4/services/spreadsheetshape-deferred.desktop
-%{_kde4_datadir}/kde4/services/tablespart.desktop
-%{_kde4_datadir}/kde4/servicetypes/tables_plugin.desktop
+%{_kde4_datadir}/kde4/services/sheetspart.desktop
+%{_kde4_datadir}/kde4/servicetypes/sheets_plugin.desktop
%{_kde4_datadir}/templates/SpreadSheet.desktop
%{_kde4_datadir}/templates/.source/SpreadSheet.kst
-%{_kde4_datadir}/applications/kde4/tables.desktop
-%{_kde4_docdir}/HTML/en/tables/
+%{_kde4_datadir}/applications/kde4/sheets.desktop
+#{_kde4_docdir}/HTML/en/sheets/
%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
-%post tables-libs -p /sbin/ldconfig
-%postun tables-libs -p /sbin/ldconfig
+%post sheets-libs -p /sbin/ldconfig
+%postun sheets-libs -p /sbin/ldconfig
-%files tables-libs
-%{_libdir}/libcalligratablescommon.so.*
-%{_libdir}/libcalligratablesodf.so.*
+%files sheets-libs
+%{_libdir}/libcalligrasheetscommon.so.*
+%{_libdir}/libcalligrasheetsodf.so.*
%posttrans stage
update-desktop-database -q &> /dev/null ||:
@@ -1094,8 +1100,12 @@ fi
%changelog
+* Sat Mar 17 2012 Rex Dieter <rdieter at fedoraproject.org> 2.3.92-1
+- 2.3.92 (2.4rc2)
+- rename -tables => -sheets
+
* Sat Mar 03 2012 Rex Dieter <rdieter at fedoraproject.org> 2.3.91-1
-- 2.3.91
+- 2.3.91 (2.4rc1)
* Sat Feb 11 2012 Rex Dieter <rdieter at fedoraproject.org> 2.3.87-4
- upstream krita_fitscreen patch (#788327)
diff --git a/sources b/sources
index 49005bb..a3af6cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f5d02279c5657e24af6e1590cebaeb3 calligra-2.3.91.tar.bz2
+4121631cf148e801cca29e2167b1806d calligra-2.3.92.tar.bz2
More information about the scm-commits
mailing list