diff --git a/.abf.yml b/.abf.yml index 78e6ea9..e8c829e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,8 @@ +removed_sources: + libreoffice-4.3.0.4.tar.xz: 68eae0e9e2a483dd04a41ce945c8b06f4654f909 + libreoffice-dictionaries-4.3.0.4.tar.xz: b8d4ce08c8f8ed257d9988783f3e39be94055d91 + libreoffice-help-4.3.0.4.tar.xz: e420a5e62d8cfcf2cbb422936484f7e5ea6a2b9d + libreoffice-translations-4.3.0.4.tar.xz: 5741002440802f65a1ddaf20ff6505c432762a38 sources: 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz: 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 @@ -28,7 +33,8 @@ sources: b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a - libreoffice-4.3.0.4.tar.xz: 68eae0e9e2a483dd04a41ce945c8b06f4654f909 - libreoffice-dictionaries-4.3.0.4.tar.xz: b8d4ce08c8f8ed257d9988783f3e39be94055d91 - libreoffice-help-4.3.0.4.tar.xz: e420a5e62d8cfcf2cbb422936484f7e5ea6a2b9d - libreoffice-translations-4.3.0.4.tar.xz: 5741002440802f65a1ddaf20ff6505c432762a38 + libgltf-0.0.0.tar.bz2: 83c732331af3efa48dc76e26064dfd04a9fb7e94 + libreoffice-4.3.1.1.tar.xz: 32a41ce1017136272d2d69e8e8a2f5c2ede32ee5 + libreoffice-dictionaries-4.3.1.1.tar.xz: defafb2dbbbe5074df733d98d22bc938f8f0e109 + libreoffice-help-4.3.1.1.tar.xz: 35076ad585d7a9b5e3da046a72925a30ef6df7e3 + libreoffice-translations-4.3.1.1.tar.xz: 7523d06dff88cf6173e66ac135ca0f78f7ae5267 diff --git a/libreoffice-4.1.0.1-non-fatal-error-during-test.patch b/libreoffice-4.1.0.1-non-fatal-error-during-test.patch index 59c176f..ec863c8 100644 --- a/libreoffice-4.1.0.1-non-fatal-error-during-test.patch +++ b/libreoffice-4.1.0.1-non-fatal-error-during-test.patch @@ -36,3 +36,25 @@ #if USE_LIBLANGTAG CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "de-Latn-DE", &aCanonicalized) && aCanonicalized == "de-DE" ); /* TODO: at least some (those we know) grandfathered tags should be +--- libreoffice-4.3.1/sw/qa/extras/ooxmlexport/ooxmlexport.cxx.orig 2014-08-12 08:55:25.786000000 +0400 ++++ libreoffice-4.3.1/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2014-08-12 08:55:40.820000000 +0400 +@@ -2983,19 +2983,6 @@ + CPPUNIT_ASSERT_EQUAL( idInDocXml, idInCommentXml ); + } + +-DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx") +-{ +- // fdo#76015 : Document contains oleobject in header xml. +- // Problem was relationship entry for oleobject from header was +- // exported into document.xml.rels file because of this rels file +- // for headers were missing from document/word/rels. +- xmlDocPtr pXmlDoc = parseExport("word/_rels/header3.xml.rels"); +- if(!pXmlDoc) +- return; +- +- assertXPath(pXmlDoc,"/rels:Relationships/rels:Relationship[1]","Id","rId1"); +-} +- + DECLARE_OOXMLEXPORT_TEST(test_ClosingBrace, "2120112713.docx") + { + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); diff --git a/libreoffice.spec b/libreoffice.spec index 9b7e680..291ca85 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,4 +1,4 @@ -%define _enable_debug_packages %{nil} +%define _enable_debug_pa ckages %{nil} %define debug_package %{nil} %define _binary_payload w1.xzdio %define _source_payload w1.xzdio @@ -25,7 +25,7 @@ %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ %define distroname ROSA %define ooname libreoffice -%define buildver %{version}.4 +%define buildver %{version}.1 %define ooodir %{_libdir}/libreoffice %define firefox_plugin libnpsoplugin.so %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1 @@ -43,7 +43,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 4.3.0 +Version: 4.3.1 %if "%beta" != "" Release: 0.%{beta}.1 %else @@ -90,6 +90,7 @@ Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d9778 Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2 Source70: %{srcurl}libgltf/3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2 Source71: %{srcurl}CoinMP-1.7.6.tgz +Source72: %{srcurl}libgltf/libgltf-0.0.0.tar.bz2 Source1000: libreoffice.rpmlintrc @@ -102,6 +103,7 @@ Patch51: libreoffice-4.2.5.2-impress-kde-crash-hack.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch Patch101: libreoffice-4.2.5.2-desktop-categories.patch +Patch102: npapi_h.patch %if %{with icecream} BuildRequires: icecream @@ -291,6 +293,7 @@ packages: %files base -f file-lists/base_list.txt %{_mandir}/man1/lobase* %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg +%{ooodir}/share/xdg/base.desktop #---------------------------------------------------------------------------- @@ -305,6 +308,7 @@ This package contains the spreadsheet component for LibreOffice. %files calc -f file-lists/calc_list.txt %{_mandir}/man1/localc* %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg +%{ooodir}/share/xdg/calc.desktop #---------------------------------------------------------------------------- @@ -346,6 +350,8 @@ This package contains the application-independent files of LibreOffice. %{_mandir}/man1/unopkg.1* %{_libdir}/libreoffice/program/classes/ScriptProviderForBeanShell.jar %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb +%{_libdir}/libreoffice/program/mailmerge.py +%{_libdir}/libreoffice/share/config/images_galaxy.zip %post common # Firefox plugin @@ -436,6 +442,7 @@ This package contains the drawing component for LibreOffice. %files draw -f file-lists/draw_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg %{_mandir}/man1/lodraw* +%{ooodir}/share/xdg/draw.desktop #---------------------------------------------------------------------------- @@ -464,6 +471,7 @@ This package contains the presentation component for LibreOffice. %files impress -f file-lists/impress_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg %{_mandir}/man1/loimpress* +%{ooodir}/share/xdg/impress.desktop #---------------------------------------------------------------------------- @@ -479,7 +487,7 @@ KDE4/Qt4.x and a KDEish File Picker when running under KDE4. %files kde4 -f file-lists/kde4_list.txt %{_libdir}/libreoffice/program/libkde4be1lo.so - +%{_libdir}/libreoffice/program/libvclplug_kde4lo.so #---------------------------------------------------------------------------- %package math @@ -493,7 +501,7 @@ This package contains the equation editor component for LibreOffice. %files math -f file-lists/math_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-math_72.svg %{_mandir}/man1/lomath* - +%{ooodir}/share/xdg/math.desktop #---------------------------------------------------------------------------- %package openclipart @@ -631,6 +639,7 @@ This package contains the word processor component for LibreOffice. %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-writer_72.svg %{_mandir}/man1/loweb* %{_mandir}/man1/lowriter* +%{ooodir}/share/xdg/writer.desktop #---------------------------------------------------------------------------- @@ -3358,7 +3367,7 @@ export MAXPROCESS=4 mkdir -p external/tarballs ln -sf %{SOURCE2} external/tarballs/ ln -sf %{SOURCE3} external/tarballs/ -ln -sf %{SOURCE4} external/tarballs/ +cp %{SOURCE4} external/tarballs/ ln -sf %{SOURCE34} external/tarballs/ ln -sf %{SOURCE35} external/tarballs/ ln -sf %{SOURCE36} external/tarballs/ @@ -3388,6 +3397,7 @@ ln -sf %{SOURCE68} external/tarballs/ ln -sf %{SOURCE69} external/tarballs/ ln -sf %{SOURCE70} external/tarballs/ ln -sf %{SOURCE71} external/tarballs/ +ln -sf %{SOURCE72} external/tarballs/ touch external/tarballs/.downloaded @@ -3504,6 +3514,9 @@ cat file-lists/common_list.uniq.sorted.txt >>file-lists/core_list.txt sort -u file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt +egrep -v "libreoffice/share/xdg/(base|calc|draw|impress|math|writer)" file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt +cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt + # files for help-* and l10n-* packages %if %{with l10n} %{expand:%(for i in %{langs}; do diff --git a/npapi_h.patch b/npapi_h.patch new file mode 100644 index 0000000..0c8943d --- /dev/null +++ b/npapi_h.patch @@ -0,0 +1,58 @@ +--- libreoffice-4.3.1/external/np_sdk/npsdk/npunix.c.orig 2014-08-14 15:57:15.387000000 +0400 ++++ libreoffice-4.3.1/external/np_sdk/npsdk/npunix.c 2014-08-14 15:57:29.099000000 +0400 +@@ -56,7 +56,7 @@ + #define XP_UNIX 1 + + #include +-#include "npapi.h" ++#include "../inc/npapi.h" + #include "npupp.h" + #include "plugin.h" + +--- libreoffice-4.3.1/external/np_sdk/npsdk/npupp.h.orig 2014-08-14 15:46:42.650000000 +0400 ++++ libreoffice-4.3.1/external/np_sdk/npsdk/npupp.h 2014-08-14 15:56:45.554000000 +0400 +@@ -48,8 +48,14 @@ + #define GENERATINGCFM 0 + #endif + +-#ifndef _NPAPI_H_ +-#include "npapi.h" ++#ifndef npapi_h_ ++#include "../inc/npapi.h" ++#endif ++ ++#if defined(__OS2__) ++#define NP_LOADDS _System ++#else ++#define NP_LOADDS + #endif + + #include "jri.h" +--- libreoffice-4.3.1/external/np_sdk/npsdk/npwin.cxx.orig 2014-08-14 15:44:23.643000000 +0400 ++++ libreoffice-4.3.1/external/np_sdk/npsdk/npwin.cxx 2014-08-14 15:44:46.609000000 +0400 +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + +-#include "npapi.h" ++#include "../inc/npapi.h" + #include "npupp.h" + #include "plugin.h" + +--- libreoffice-4.3.1/external/np_sdk/npsdk/plugin.h.orig 2014-08-14 15:48:07.948000000 +0400 ++++ libreoffice-4.3.1/external/np_sdk/npsdk/plugin.h 2014-08-14 15:56:04.674000000 +0400 +@@ -20,7 +20,13 @@ + #ifndef INCLUDED_NP_SDK_MOZSRC_PLUGIN_H + #define INCLUDED_NP_SDK_MOZSRC_PLUGIN_H + +-#include "npapi.h" ++#include "../inc/npapi.h" ++ ++#if defined(__OS2__) ++#define NP_LOADDS _System ++#else ++#define NP_LOADDS ++#endif + + /* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and + NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,