diff --git a/.abf.yml b/.abf.yml index d61fc9e..a727bfc 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,8 @@ +removed_sources: + libreoffice-4.2.5.2.tar.xz: 42b532233e4226f2b71841806cab555f05132c3f + libreoffice-dictionaries-4.2.5.2.tar.xz: c84fa5de085253df3e85952ee09d2726d8de3255 + libreoffice-help-4.2.5.2.tar.xz: 8c09ab1f8c42a4aeefcb60bd782db45bc5f18e7a + libreoffice-translations-4.2.5.2.tar.xz: 8114da4235820205e4dd4650fcdfb049c823e516 sources: 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz: 452eba922e4f41603539c9dc39947d2271e47093 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a @@ -11,15 +16,19 @@ sources: 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz: efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050 + 3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2: ee43834dbd358d2d538b39cdf0b33f15f3195246 3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt: c01632cfaee10322bc4badef316bedd08a759224 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt: e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6 + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca 8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8 + CoinMP-1.7.6.tgz: f52c74abcbf55c72cd89f709db658ea33ed45154 Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f + OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36 a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853 af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz: d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7 @@ -30,7 +39,7 @@ 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.2.5.2.tar.xz: 42b532233e4226f2b71841806cab555f05132c3f - libreoffice-dictionaries-4.2.5.2.tar.xz: c84fa5de085253df3e85952ee09d2726d8de3255 - libreoffice-help-4.2.5.2.tar.xz: 8c09ab1f8c42a4aeefcb60bd782db45bc5f18e7a - libreoffice-translations-4.2.5.2.tar.xz: 8114da4235820205e4dd4650fcdfb049c823e516 + 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 diff --git a/libreoffice-4.1-vendor.patch b/libreoffice-4.1-vendor.patch index 51de0eb..9bcd237 100644 --- a/libreoffice-4.1-vendor.patch +++ b/libreoffice-4.1-vendor.patch @@ -1,42 +1,42 @@ --- a/bin/distro-install-file-lists 2013-08-21 15:40:03.000000000 +0400 +++ b/bin/distro-install-file-lists 2013-09-09 22:09:30.051856888 +0400 -@@ -135,7 +135,7 @@ +@@ -136,7 +136,7 @@ fi - if test "$SPLIT_OPT_FEATURES" = "YES" ; then + if test "$SPLIT_OPT_FEATURES" = "TRUE" ; then - if test "z$OOO_VENDOR" = "zMandriva" ; then + if test "z$OOO_VENDOR" = "zROSA" ; then merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt -@@ -165,7 +165,7 @@ +@@ -166,7 +166,7 @@ # lang packs for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do lang_lists= -- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then -+ if test "$OOO_VENDOR" = "ROSA" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then +- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then ++ if test "$OOO_VENDOR" = "ROSA" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then test -f gid_Module_Langpack_Basis_$lang && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || : test -f gid_Module_Langpack_Brand_$lang && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || : test -f gid_Module_Langpack_Resource_$lang && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || : -@@ -196,7 +196,7 @@ +@@ -197,7 +197,7 @@ fi # some help files are in _Langpack_{Writer,Impress,...}_ # move them from -l10n to -help -- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then -+ if test "$OOO_VENDOR" = "ROSA" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then +- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then ++ if test "$OOO_VENDOR" = "ROSA" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "TRUE" \) ; then for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do test -f $FILELISTSDIR/help_${lang}_list.txt || continue; mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.* -@@ -264,7 +264,7 @@ +@@ -265,7 +265,7 @@ # mailmerge - if test "$SPLIT_OPT_FEATURES" = "YES" ; then + if test "$SPLIT_OPT_FEATURES" = "TRUE" ; then - if test "z$OOO_VENDOR" = "zMandriva" ; then -+ if test "z$OOO_VENDOR" = "zROSA" ; then ++ if test "z$OOO_VENDOR" = "xROSA" ; then flist=pyuno_list.txt else flist=mailmerge_list.txt -@@ -295,8 +295,8 @@ +@@ -296,8 +296,8 @@ fi 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 7f50f5a..1b3540a 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 @@ -1,15 +1,14 @@ --- libreoffice-4.1.0/sdext/source/pdfimport/test/tests.cxx.orig 2013-06-22 23:27:34.085446358 +0000 +++ libreoffice-4.1.0/sdext/source/pdfimport/test/tests.cxx 2013-06-22 23:29:24.585444706 +0000 -@@ -88,12 +88,18 @@ - CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height" , m_aPageSize.Height, 59500, 0.0000001 ); +@@ -88,11 +88,16 @@ + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height", 59500, m_aPageSize.Height, 0.0000001 ); CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", m_nNumPages, (sal_Int32) 1 ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", (sal_Int32) 1, m_nNumPages ); - CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box", - rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) && - rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && - rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && - rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) ); -- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, OUString("http://download.openoffice.org/") ); + if(!(rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) && + rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) && + rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) && @@ -20,8 +19,16 @@ + << " X2 (should be 166.7): " << m_aHyperlinkBounds.X2 << std::endl + << " Y2 (should be 406.2): " << m_aHyperlinkBounds.Y2 << std::endl; + } // Correct hyperlink bounding box -+ //CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") ); -+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, OUString("http://download.openoffice.org/") ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", OUString("http://download.openoffice.org/"), m_aURI ); const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n" - "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n"; +--- libreoffice-4.3.0/i18nlangtag/qa/cppunit/test_languagetag.cxx.orig 2014-08-05 13:47:52.947357928 +0400 ++++ libreoffice-4.3.0/i18nlangtag/qa/cppunit/test_languagetag.cxx 2014-08-05 13:48:01.328357612 +0400 +@@ -592,7 +592,6 @@ + OUString aCanonicalized; + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized) && aCanonicalized == "en-US" ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized) && aCanonicalized == "x-foobar" ); +- CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "qaa", &aCanonicalized) && aCanonicalized == "qaa" ); + CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "unreg-and-bad", &aCanonicalized) ); + CPPUNIT_ASSERT( LanguageTag::isValidBcp47( "en-US", &aCanonicalized, true) && aCanonicalized == "en-US" ); + CPPUNIT_ASSERT( !LanguageTag::isValidBcp47( "x-foobar", &aCanonicalized, true) && aCanonicalized == "x-foobar" ); diff --git a/libreoffice-4.2.1-non-fatal-test-failures.patch b/libreoffice-4.2.1-non-fatal-test-failures.patch deleted file mode 100644 index d1a0f53..0000000 --- a/libreoffice-4.2.1-non-fatal-test-failures.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libreoffice-4.2.1/solenv/gbuild/CppunitTest.mk.omv~ 2014-02-24 08:54:32.591669325 +0100 -+++ libreoffice-4.2.1/solenv/gbuild/CppunitTest.mk 2014-02-24 08:55:24.354667206 +0100 -@@ -95,7 +95,7 @@ $(call gb_CppunitTest_get_target,%) :| $ - $(if $(value gb_CppunitTest_postprocess), \ - && $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1) \ - && cat $@.log && $(call gb_UNIT_FAILED_MSG,Cppunit,$*) \ -- && false)))) -+ || true)))) - - define gb_CppunitTest_CppunitTest - $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1))) diff --git a/libreoffice-4.2.5.2-desktop-categories.patch b/libreoffice-4.2.5.2-desktop-categories.patch index f38baf8..337b241 100644 --- a/libreoffice-4.2.5.2-desktop-categories.patch +++ b/libreoffice-4.2.5.2-desktop-categories.patch @@ -20,7 +20,7 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/calc.desktop libreoffice -Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets; +Categories=Office;Spreadsheet; Exec=${UNIXBASISROOTNAME} --calc %%FILE%% - MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml; + MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks; Name=%PRODUCTNAME Calc diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop libreoffice-4.2.5.2/sysui/desktop/menus/draw.desktop --- libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop 2014-06-12 12:25:19.000000000 +0400 @@ -32,7 +32,7 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop libreoffice -Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; +Categories=Office;FlowChart; Exec=${UNIXBASISROOTNAME} --draw %%FILE%% - MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand; + MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks; Name=%PRODUCTNAME Draw diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop libreoffice-4.2.5.2/sysui/desktop/menus/impress.desktop --- libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop 2014-06-12 12:25:19.000000000 +0400 @@ -53,8 +53,8 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop libreoffice NoDisplay=false Icon=math Type=Application --Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; -+Categories=Office;Education;Science;Math; +-Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; ++Categories=Office;Spreadsheet;Education;Science;Math; Exec=${UNIXBASISROOTNAME} --math %%FILE%% MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml; Name=%PRODUCTNAME Math diff --git a/libreoffice.spec b/libreoffice.spec index 85f1949..9bf129b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -25,11 +25,10 @@ %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ %define distroname ROSA %define ooname libreoffice -%define buildver %{version}.2 +%define buildver %{version}.4 %define ooodir %{_libdir}/libreoffice %define firefox_plugin libnpsoplugin.so %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1 -#define unopkg %{_bindir}/unopkg %define ccachedir ~/.ccache-OOo @@ -44,11 +43,11 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 4.2.5 +Version: 4.3.0 %if "%beta" != "" Release: 0.%{beta}.1 %else -Release: 2 +Release: 1 %endif Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz @@ -60,69 +59,32 @@ Url: http://www.libreoffice.org Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source10: Mandriva-Rosa_Icons.tar.bz2 -#javaless -%if %{javaless} -Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2 -Source30: %{devurl}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz -Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -Source32: %{devurl}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz -Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -%endif Source34: %{devurl}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -# External Download Sources -Source40: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz # Extensions Source50: %{srcurl}451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt -Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 -Source52: %{oxyurl}3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt -Source53: %{oxyurl}8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt -Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -Source55: %{srcurl}27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt -Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt -Source57: %{oxyurl}9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -Source58: %{oxyurl}bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -Source59: %{oxyurl}23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt Source60: %{oxyurl}af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip Source61: %{oxyurl}1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip -Source62: %{oxyurl}53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt -Source63: %{oxyurl}472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt -Source64: %{oxyurl}4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt -Source65: %{oxyurl}a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt -Source66: %{oxyurl}09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt -Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt +Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 +Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2 +Source70: %{srcurl}libgltf/3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2 +Source71: %{srcurl}CoinMP-1.7.6.tgz Source1000: libreoffice.rpmlintrc Patch0: libreoffice-4.1.0.1-non-fatal-error-during-test.patch Patch1: libreoffice-4.2.5-icu-49.patch Patch2: help-images-mdv64789.patch -# FIXME this is wrong, but seems to be needed for now -- there seems to -# be something wrong with the unit tests rather than the code being -# tested (failures while loading libraries -- probably looking for a -# pre-existing installation of the same LO version) -Patch3: libreoffice-4.2.1-non-fatal-test-failures.patch -# Force Qt4 event loops because with glib event loops libreoffice-kde4 doesn't -# work well -# Requires patched Qt4, see https://bugreports.qt-project.org/browse/QTBUG-16934 -# Patch50: libreoffice-4.1.2.2-kde-qt-event-loop.patch -# From ROSA: -# Hack: Don't display tiny useless scrollbars with libreoffice-kde4 -# Impress is known to crash when adding effects (segfault is triggered by 15x18 scrollbar) 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 -# Other bugfix patches, including upstream -# Patch202: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch - %if %{with icecream} BuildRequires: icecream %endif @@ -163,8 +125,8 @@ BuildRequires: cups-devel BuildRequires: hyphen-devel BuildRequires: java-devel BuildRequires: kdelibs4-devel -BuildRequires: libwpd-devel >= 0.9.0 -BuildRequires: libwpg-devel +BuildRequires: pkgconfig(libwpd-0.10) +BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: libwps-devel BuildRequires: lpsolve-devel BuildRequires: nas-devel @@ -175,12 +137,13 @@ BuildRequires: qt4-devel BuildRequires: readline-devel BuildRequires: unixODBC-devel BuildRequires: vigra-devel +BuildRequires: glm-devel BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(libetonyek-0.0) -BuildRequires: pkgconfig(libfreehand-0.0) +BuildRequires: pkgconfig(libetonyek-0.1) +BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glitz) @@ -195,25 +158,25 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libabw-0.0) +BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libclucene-core) BuildRequires: pkgconfig(libcmis-0.4) BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libcdr-0.0) -BuildRequires: pkgconfig(libe-book-0.0) +BuildRequires: pkgconfig(libcdr-0.1) +BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) -BuildRequires: pkgconfig(libixion-0.6) +BuildRequires: pkgconfig(libixion-0.8) BuildRequires: pkgconfig(liblangtag) -BuildRequires: pkgconfig(libmspub-0.0) -BuildRequires: pkgconfig(libmwaw-0.2) -BuildRequires: pkgconfig(libodfgen-0.0) >= 0.0.3 -BuildRequires: pkgconfig(liborcus-0.6) +BuildRequires: pkgconfig(libmspub-0.1) +BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.1 +BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0 +BuildRequires: pkgconfig(liborcus-0.8) >= 0.7.0 BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libsvg) BuildRequires: pkgconfig(libucpp) -BuildRequires: pkgconfig(libvisio-0.0) +BuildRequires: pkgconfig(libvisio-0.1) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libxul) @@ -240,6 +203,8 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) BuildRequires: db-devel BuildRequires: locales-en +BuildRequires: pkgconfig(librevenge-0.0) +BuildRequires: pkgconfig(glew) %if !%{javaless} BuildRequires: ant BuildRequires: ant-apache-regexp @@ -338,7 +303,7 @@ Requires: desktop-common-data >= 2008 # rpm will automatically grab the require for libsane1, but there are some # configs needed at this package, so we must require it too. Requires: sane-backends -# Due to %{_bindir}/paperconf +# Due to {_bindir}/paperconf # Requires: paper-utils Requires(post,postun): desktop-file-utils Requires(post,postun): update-alternatives @@ -3366,54 +3331,33 @@ sed -i -e "s,\$ENV{'MD5SUM'},md5sum,g" solenv/bin/modules/installer/systemaction echo "Configure end at: "`date` >> ooobuildtime.log echo "Make start at: "`date` >> ooobuildtime.log -# some configs to improve build process +# some configs to improve build process # http://wiki.services.openoffice.org/wiki/Building_OpenOffice.org -# needs to check if it does any effect +# needs to check if it does any effect export nodep=TRUE export NO_HIDS=TRUE export MAXPROCESS=4 -mkdir -p src -ln -sf %{SOURCE2} src/ -ln -sf %{SOURCE3} src/ -ln -sf %{SOURCE4} src/ -%if %{javaless} -ln -sf %{SOURCE30} src/ -ln -sf %{SOURCE31} src/ -ln -sf %{SOURCE32} src/ -ln -sf %{SOURCE33} src/ -%endif -ln -sf %{SOURCE34} src/ -ln -sf %{SOURCE35} src/ -ln -sf %{SOURCE36} src/ -ln -sf %{SOURCE37} src/ +mkdir -p external/tarballs +ln -sf %{SOURCE2} external/tarballs/ +ln -sf %{SOURCE3} external/tarballs/ +ln -sf %{SOURCE4} external/tarballs/ +ln -sf %{SOURCE34} external/tarballs/ +ln -sf %{SOURCE35} external/tarballs/ +ln -sf %{SOURCE36} external/tarballs/ -ln -sf %{SOURCE40} src/ +ln -sf %{SOURCE50} external/tarballs/ -ln -sf %{SOURCE50} src/ -ln -sf %{SOURCE51} src/ -ln -sf %{SOURCE52} src/ -ln -sf %{SOURCE53} src/ -ln -sf %{SOURCE54} src/ -ln -sf %{SOURCE55} src/ -ln -sf %{SOURCE56} src/ -ln -sf %{SOURCE57} src/ -ln -sf %{SOURCE58} src/ -ln -sf %{SOURCE59} src/ -ln -sf %{SOURCE60} src/ -ln -sf %{SOURCE61} src/ -ln -sf %{SOURCE62} src/ -ln -sf %{SOURCE63} src/ -ln -sf %{SOURCE64} src/ -ln -sf %{SOURCE65} src/ -ln -sf %{SOURCE66} src/ -ln -sf %{SOURCE67} src/ +ln -sf %{SOURCE68} external/tarballs/ +ln -sf %{SOURCE69} external/tarballs/ +ln -sf %{SOURCE70} external/tarballs/ +ln -sf %{SOURCE71} external/tarballs/ -touch src.downloaded +touch external/tarballs/.downloaded # (tpg) silent output to reduce memory and free space # We use make build here because the default target is "allandcheck". -# Checking should go to %check +# Checking should go to check make -r -s V=0 \ ARCH_FLAGS="$ARCH_FLAGS" \ @@ -3436,10 +3380,6 @@ PATH=$PATH:/usr/sbin make DESTDIR=%{buildroot} distro-pack-install rm -rf %{buildroot}/opt -# use the dicts from myspell- -# rm -rf %{buildroot}%{ooodir}/share/dict/ooo -# ln -s %{_datadir}/dict/ooo %{buildroot}%{ooodir}/share/dict - # Mandriva Rosa icons mkdir -p %{buildroot}%{_iconsdir}/hicolor/scalable/apps/ tar -xjvf %{SOURCE10} --exclude Libre_Office* -C %{buildroot}%{_iconsdir}/hicolor/scalable/apps/ @@ -3461,33 +3401,6 @@ find %{buildroot} -type f -exec chmod u+rw '{}' \; # fix permission of .so libraries find %{buildroot} -type f \( -name '*.so' -o -name '*.so.*' \) -exec chmod a+x '{}' \; -# Anssi patch -# remove /usr/bin/soffice (made with update-alternatives) -# rm -f %{buildroot}%{_bindir}/soffice - -# Anssi -# Install a random UNO extension into BUILDROOT and remove it, so that unopkg -# creates the cache directories and files that can then be ghostified. -# Simple "list" would create everything but files inside -# "com.sun.star.comp.deployment.component.PackageRegistryBackend". -# Note that this has to be run before below bro calls below that rename needed -# files and thus disable unopkg for the rest of install stage. -# First make sure there is no actual data pre-existing in this directory, -# as that will be lost due to the ghostification: -# [ $(find %{buildroot}%{ooodir}/share/uno_packages/cache -type f | wc -l) -eq 0 ] -# %{buildroot}%{ooodir}/program/unopkg add --shared %{_builddir}/libreoffice-%{version}/solver/340/unxlng*/bin/pdfimport/pdfimport.oxt -# %{buildroot}%{ooodir}/program/unopkg remove --shared pdfimport.oxt -# # clean cache -# %{buildroot}%{ooodir}/program/unopkg list --shared -# # there should be more files now: -# [ $(find %{buildroot}%{ooodir}/share/uno_packages/cache | wc -l) -ge 5 ] -# for path in $(find %{buildroot}%{ooodir}/share/uno_packages/cache/); do -# if [ -d $path ]; then -# echo "%%dir ${path#%{buildroot}}" >> build/common_list.txt -# else -# echo "%%ghost ${path#%{buildroot}}" >> build/common_list.txt -# fi -# done # Change progress bar colors sed -i '/^ProgressBarColor/d;/^ProgressFrameColor/d' \ @@ -3555,7 +3468,7 @@ 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 -# %%files for help-* and l10n-* packages +# files for help-* and l10n-* packages %if %{with l10n} %{expand:%(for i in %{langs}; do [ "$i" = "en-US" ] && continue; @@ -3566,6 +3479,6 @@ done)} %{expand:%(for i in %{helplangs}; do l=`echo $i |sed -e 's,-,_,g'`; echo "%%files help-$l -f file-lists/help_${l}_list.txt"; - echo "%%_libdir/libreoffice/help/$i"; + echo "%%{_libdir}/libreoffice/help/$i"; done)} %endif