From c6746abd2a8d1ce4487b5197570cfb4900884149 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 9 Jun 2014 14:29:58 +0200 Subject: [PATCH] Resolves: rhbz#1105376 FlatODF import/export does not work unless libreoffice-xsltfilter is installed --- ...e-FlatODF-filter-config-to-right-pla.patch | 107 ++++++++++++++++++ libreoffice.spec | 7 +- 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 0001-rhbz-1105376-move-FlatODF-filter-config-to-right-pla.patch diff --git a/0001-rhbz-1105376-move-FlatODF-filter-config-to-right-pla.patch b/0001-rhbz-1105376-move-FlatODF-filter-config-to-right-pla.patch new file mode 100644 index 0000000..c04ddf6 --- /dev/null +++ b/0001-rhbz-1105376-move-FlatODF-filter-config-to-right-pla.patch @@ -0,0 +1,107 @@ +From 6e299a555dc03982f6e03434f2726ca440fcee53 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 9 Jun 2014 11:53:00 +0200 +Subject: [PATCH] rhbz#1105376 move FlatODF filter config to right place + +This has been broken since 3.3(!), when the old XSLT based import/export +was replaced by a library. + +Change-Id: Id335f296c5a0e2c15d1748f8a14ac8d4001e1d15 +--- + filter/Configuration_filter.mk | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk +index 825a899..f53cf07 100644 +--- a/filter/Configuration_filter.mk ++++ b/filter/Configuration_filter.mk +@@ -318,6 +318,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter + writer_MS_Word_95_Vorlage \ + writer_MS_Word_97 \ + writer_MS_Word_97_Vorlage \ ++ writer_ODT_FlatXML \ + writer_Rich_Text_Format \ + writer_StarOffice_XML_Writer \ + writer_WordPerfect_Document \ +@@ -378,6 +379,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi + MS_Word_95_Vorlage \ + MS_Word_97 \ + MS_Word_97_Vorlage \ ++ ODT_FlatXML \ + Rich_Text_Format \ + StarOffice_XML__Writer_ \ + WordPerfect \ +@@ -511,6 +513,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr + # fcfg_calc + $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\ + calc_DIF \ ++ calc_ODS_FlatXML \ + generic_HTML \ + generic_Text \ + calc_Lotus \ +@@ -549,6 +552,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s + $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\ + DIF \ + HTML__StarCalc_ \ ++ ODS_FlatXML \ + Lotus \ + QPro \ + MS_Excel_4_0 \ +@@ -606,6 +610,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr + + # fcfg_draw + $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\ ++ draw_ODG_FlatXML \ + draw_StarOffice_XML_Draw \ + draw_StarOffice_XML_Draw_Template \ + pdf_Portable_Document_Format \ +@@ -627,6 +632,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s + ) + + $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\ ++ ODG_FlatXML \ + StarOffice_XML__Draw_ \ + draw_StarOffice_XML_Draw_Template \ + draw_pdf_Export \ +@@ -660,6 +666,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte + impress_MS_PowerPoint_97 \ + impress_MS_PowerPoint_97_AutoPlay \ + impress_MS_PowerPoint_97_Vorlage \ ++ impress_ODP_FlatXML \ + impress_StarOffice_XML_Impress \ + impress_StarOffice_XML_Impress_Template \ + pdf_Portable_Document_Format \ +@@ -681,6 +688,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,f + MS_PowerPoint_97_AutoPlay \ + MS_PowerPoint_97_Vorlage \ + impress_StarOffice_XML_Draw \ ++ ODP_FlatXML \ + StarOffice_XML__Impress_ \ + impress_StarOffice_XML_Impress_Template \ + impress_pdf_Export \ +@@ -984,11 +992,7 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap + + # fcfg_xslt + $(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\ +- calc_ODS_FlatXML \ +- draw_ODG_FlatXML \ +- impress_ODP_FlatXML \ + writer_DocBook_File \ +- writer_ODT_FlatXML \ + XHTML_File \ + Unified_Office_Format_text \ + Unified_Office_Format_spreadsheet \ +@@ -997,10 +1001,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/s + + $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filter/source/config/fragments/filters,\ + DocBook_File \ +- ODG_FlatXML \ +- ODP_FlatXML \ +- ODS_FlatXML \ +- ODT_FlatXML \ + XHTML_Calc_File \ + XHTML_Draw_File \ + XHTML_Impress_File \ +-- +1.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index c92d3c5..0bfce72 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -44,7 +44,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 8%{?libo_prerelease}%{?dist} +Release: 9%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/ @@ -301,6 +301,7 @@ Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch # not upstreamed Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch Patch17: 0001-deb-749592-mysql-connector-doesn-t-work-with-remote-.patch +Patch18: 0001-rhbz-1105376-move-FlatODF-filter-config-to-right-pla.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2284,6 +2285,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Jun 09 2014 David Tardon - 1:4.3.0.0-9.beta2 +- Resolves: rhbz#1105376 FlatODF import/export does not work unless + libreoffice-xsltfilter is installed + * Wed Jun 04 2014 David Tardon - 1:4.3.0.0-8.beta2 - update to 4.3.0 beta2