diff --git a/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch b/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch new file mode 100644 index 0000000..86b2aca --- /dev/null +++ b/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch @@ -0,0 +1,67 @@ +From a482b89e4d9c41b6f7c1616d193ac6cde05a69a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 2 Apr 2012 20:57:02 +0100 +Subject: [PATCH] Resolves: fdo#48096 torn off popups trigger keyboard focus + problems + +--- + svx/source/tbxctrls/linectrl.cxx | 4 ++-- + svx/source/tbxctrls/tbcontrl.cxx | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx +index c81177e..ccc047c4 100644 +--- a/svx/source/tbxctrls/linectrl.cxx ++++ b/svx/source/tbxctrls/linectrl.cxx +@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow( + const String& rWndTitle ) : + SfxPopupWindow( nSlotId, + rFrame, +- WinBits( WB_STDPOPUP ) ), ++ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), + nCols ( 2 ), + nLines ( 12 ), +@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow( + SfxPopupWindow( nSlotId, + rFrame, + pParentWindow, +- WinBits( WB_STDPOPUP ) ), ++ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), + nCols ( 2 ), + nLines ( 12 ), +diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx +index cb56fac..f9f25a8 100644 +--- a/svx/source/tbxctrls/tbcontrl.cxx ++++ b/svx/source/tbxctrls/tbcontrl.cxx +@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, + Window* pParentWindow, + const ::Color rLastColor ) : + +- SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), ++ SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + + theSlotId( nSlotId ), + aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ), +@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co + + SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : + +- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), ++ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), + bParagraphMode(sal_False) + +@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) + + SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : + +- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ), ++ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ), + m_aLineStyleLb( this ) + { + try +-- +1.7.7.6 + diff --git a/0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch b/0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch new file mode 100644 index 0000000..3162065 --- /dev/null +++ b/0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch @@ -0,0 +1,371 @@ +From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sun, 13 May 2012 22:41:30 +0100 +Subject: [PATCH] Resolves: fdo#49849 implement Unicode 6.1 hebrew line + breaking rules + +i.e. sync with svn diff -c 31071 +http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt + +Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 +--- + i18npool/qa/cppunit/test_breakiterator.cxx | 89 +++++++++++++++++--------- + i18npool/source/breakiterator/data/README | 12 ++++ + i18npool/source/breakiterator/data/line.txt | 57 +++++++++++------- + 3 files changed, 105 insertions(+), 53 deletions(-) + create mode 100644 i18npool/source/breakiterator/data/README + +diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx +index 14051d4..ffd590c 100644 +--- a/i18npool/qa/cppunit/test_breakiterator.cxx ++++ b/i18npool/qa/cppunit/test_breakiterator.cxx +@@ -45,6 +45,7 @@ + #include + + #include ++#include + + #include + +@@ -64,6 +65,9 @@ + void testWeak(); + void testAsian(); + void testThai(); ++#if TODO ++ void testNorthernThai(); ++#endif + + CPPUNIT_TEST_SUITE(TestBreakIterator); + CPPUNIT_TEST(testLineBreaking); +@@ -71,6 +75,9 @@ + CPPUNIT_TEST(testWeak); + CPPUNIT_TEST(testAsian); + CPPUNIT_TEST(testThai); ++#if TODO ++ CPPUNIT_TEST(testNorthernThai); ++#endif + CPPUNIT_TEST_SUITE_END(); + + private: +@@ -80,28 +87,46 @@ + uno::Reference m_xBreak; + }; + +-//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation + void TestBreakIterator::testLineBreaking() + { +- ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); +- + i18n::LineBreakHyphenationOptions aHyphOptions; + i18n::LineBreakUserOptions aUserOptions; + lang::Locale aLocale; ++ ++ //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 ++ { ++ ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); + +- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); +- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); ++ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); ++ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + +- { +- //Here we want the line break to leave text here) on the next line +- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); +- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); +- } ++ { ++ //Here we want the line break to leave text here) on the next line ++ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); ++ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); ++ } + ++ { ++ //Here we want the line break to leave "here)" on the next line ++ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); ++ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); ++ } ++ } ++ ++ //See https://bugs.freedesktop.org/show_bug.cgi?id=49849 + { +- //Here we want the line break to leave "here)" on the next line +- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); +- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); ++ const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD }; ++ ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); ++ ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); ++ ++ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")); ++ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL")); ++ ++ { ++ //Here we want the line break to happen at the whitespace ++ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions); ++ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1); ++ } + } + } + +@@ -260,28 +285,30 @@ + aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); + aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); + +- i18n::Boundary aBounds; +- { +- const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; +- ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); +- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, +- i18n::WordType::DICTIONARY_WORD, true); +- CPPUNIT_ASSERT_MESSAGE("Should skip full word", +- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); +- } +- +-#ifdef TODO +- { +- const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; +- ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); +- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, +- i18n::WordType::DICTIONARY_WORD, true); +- CPPUNIT_ASSERT_MESSAGE("Should skip full word", +- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); +- } +-#endif ++ const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; ++ ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); ++ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, ++ i18n::WordType::DICTIONARY_WORD, true); ++ CPPUNIT_ASSERT_MESSAGE("Should skip full word", ++ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); + } + ++#if TODO ++void TestBreakIterator::testNorthernThai() ++{ ++ lang::Locale aLocale; ++ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); ++ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); ++ ++ const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; ++ ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); ++ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, ++ i18n::WordType::DICTIONARY_WORD, true); ++ CPPUNIT_ASSERT_MESSAGE("Should skip full word", ++ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); ++} ++#endif ++ + TestBreakIterator::TestBreakIterator() + { + m_xContext = cppu::defaultBootstrap_InitialComponentContext(); +diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README +new file mode 100644 +index 0000000..8d7598d +--- /dev/null ++++ b/i18npool/source/breakiterator/data/README +@@ -0,0 +1,12 @@ ++The originals of these come from svn checkout ++http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no ++longer appear in the icu tarballs, but are in icu's svn ++ ++At various stages these copies have been customized and are not horribly out of ++sync. It unclear which diffs from the base versions are deliberate and which ++are now accidental :-( ++ ++We need to review the various issues referenced in the commits that caused ++custimizations and see if they're still relevant or not, write regression tests ++for them, if any are still relavant then apply the changes back on top of the ++latest versions. +diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt +index cbabee6..91c8f3d 100644 +--- a/i18npool/source/breakiterator/data/line.txt ++++ b/i18npool/source/breakiterator/data/line.txt +@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; + $BK = [:LineBreak = Mandatory_Break:]; + $B2 = [:LineBreak = Break_Both:]; + $CB = [:LineBreak = Contingent_Break:]; ++$CJ = [:LineBreak = Conditional_Japanese_Starter:]; + $CL = [:LineBreak = Close_Punctuation:] ; + $CM = [:LineBreak = Combining_Mark:]; + $CR = [:LineBreak = Carriage_Return:]; + $EX = [:LineBreak = Exclamation:]; + $GL = [:LineBreak = Glue:]; ++$HL = [:LineBreak = Hebrew_Letter:]; + $HY = [:LineBreak = Hyphen:]; + $H2 = [:LineBreak = H2:]; + $H3 = [:LineBreak = H3:]; +@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; + $JT = [:LineBreak = JT:]; + $LF = [:LineBreak = Line_Feed:]; + $NL = [:LineBreak = Next_Line:]; +-$NS = [:LineBreak = Nonstarter:]; ++$NS = [[:LineBreak = Nonstarter:] $CJ]; + $NU = [:LineBreak = Numeric:]; + $OP = [[:LineBreak = Open_Punctuation:] - $DG]; + $PO = [:LineBreak = Postfix_Numeric:]; +@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; + $CLcm = $CL $CM*; + $EXcm = $EX $CM*; + $GLcm = $GL $CM*; ++$HLcm = $HL $CM*; + $HYcm = $HY $CM*; + $H2cm = $H2 $CM*; + $H3cm = $H3 $CM*; +@@ -150,6 +153,7 @@ $B2 $CM+; + $CL $CM+; + $EX $CM+; + $GL $CM+; ++$HL $CM+; + $HY $CM+; + $H2 $CM+; + $H3 $CM+; +@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs + # so for this one case we need to manually list out longer sequences. + # + $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; +-$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; ++$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; + $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; + + +@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); + $BBcm [^$CB]; # $BB x + $BBcm $LB20NonBreaks $CM*; + ++# LB 21a Don't break after Hebrew + Hyphen ++# HL (HY | BA) x ++# ++$HLcm ($HYcm | $BAcm) [^$CB]?; ++ + # LB 22 +-$ALcm $INcm; ++($ALcm | $HLcm) $INcm; + $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL + $IDcm $INcm; + $INcm $INcm; +@@ -331,16 +340,18 @@ $NUcm $INcm; + # $LB 23 + $IDcm $POcm; + $ALcm $NUcm; # includes $LB19 ++$HLcm $NUcm; + $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL + $NUcm $ALcm; ++$NUcm $HLcm; + + # + # LB 24 + # + $PRcm $IDcm; + $ALcm $PRcm; +-$PRcm $ALcm; +-$POcm $ALcm; ++$PRcm ($ALcm | $HLcm); ++$POcm ($ALcm | $HLcm); + + # + # LB 25 Numbers. +@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); + + # LB 28 Do not break between alphabetics + # +-$ALcm $ALcm; +-$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL ++($ALcm | $HLcm) ($ALcm | $HLcm); ++$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL + + # LB 29 + $IScm ($ALcm | $NUcm); +@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); + # Rule 30 Do not break between letters, numbers or ordinary symbols + # and opening or closing punctuation + # +-($ALcm | $NUcm) $OPcm; ++($ALcm | $HLcm | $NUcm) $OPcm; + $CM+ $OPcm; +-$CLcm ($ALcm | $NUcm); +- +- ++$CLcm ($ALcm | $HLcm | $NUcm); + + # + # Reverse Rules. +@@ -391,6 +400,7 @@ $CM+ $B2; + $CM+ $CL; + $CM+ $EX; + $CM+ $GL; ++$CM+ $HL; + $CM+ $HY; + $CM+ $H2; + $CM+ $H3; +@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) + $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . + [^$CB] $CM* $BB; # + +- ++# LB21a ++[^$CB] $CM* ($HY | $BA) $CM* $HL; + + # LB 22 +-$CM* $IN $CM* $ALPlus; ++$CM* $IN $CM* ($ALPlus | $HL); + $CM* $IN $CM* $ID; + $CM* $IN $CM* $IN; + $CM* $IN $CM* $NU; + + # LB 23 + $CM* $PO $CM* $ID; +-$CM* $NU $CM* $ALPlus; +-$CM* $ALPlus $CM* $NU; ++$CM* $NU $CM* ($ALPlus | $HL); ++$CM* ($ALPlus | $HL) $CM* $NU; + + # LB 24 + $CM* $ID $CM* $PR; + $CM* $PR $CM* $ALPlus; +-$CM* $ALPlus $CM* $PR; +-$CM* $ALPlus $CM* $PO; ++$CM* ($ALPlus | $HL) $CM* $PR; ++$CM* ($ALPlus | $HL) $CM* $PO; + + $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; + $CM* $NU+ $CM* $HY+ / $SP; +@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL); + $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; + + # LB 28 +-$CM* $ALPlus $CM* $ALPlus; +- ++$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); + + # LB 29 + $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; + + # LB 30 +-$CM* $OP $CM* ($NU | $ALPlus); +-$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; ++$CM* $OP $CM* ($ALPlus | $HL | $NU); ++$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; + + + ## ------------------------------------------------- +@@ -609,6 +619,9 @@ $SP+ $CM* $QU; + $SP+ $CM* $CL; + $SP+ $CM* $B2; + ++# LB 21 ++$CM* ($HY | $BA) $CM* $HL; ++ + # LB 18 + ($CM* ($IS | $SY))+ $CM* $NU; + $CL $CM* ($NU | $IS | $SY); +@@ -629,6 +642,6 @@ $dictionary $dictionary; + # turn off rule chaining. We don't want to move more + # than necessary. + # +-[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; ++[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; + $dictionary $dictionary; + +-- +1.7.7.6 + diff --git a/0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch b/0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch new file mode 100644 index 0000000..3e61acb --- /dev/null +++ b/0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch @@ -0,0 +1,24 @@ +From 13b6afe8c8e26d837fc9de9428fe2bfca1b551c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 7 Feb 2012 13:36:50 +0000 +Subject: [PATCH] Resolves: rhbz#788042 skip splashscreen with --quickstart + +--- + desktop/unx/source/args.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c +index 367bac2..0952911 100644 +--- a/desktop/unx/source/args.c ++++ b/desktop/unx/source/args.c +@@ -58,6 +58,7 @@ static struct { + { "nologo", 0, 1, 0, 0, NULL }, + { "headless", 0, 1, 0, 0, NULL }, + { "invisible", 0, 1, 0, 0, NULL }, ++ { "quickstart", 0, 1, 0, 0, NULL }, + { "minimized", 0, 1, 0, 0, NULL }, + + /* pagein bits */ +-- +1.7.6.5 + diff --git a/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch b/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch new file mode 100644 index 0000000..6be0cc3 --- /dev/null +++ b/0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch @@ -0,0 +1,24 @@ +diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in +index 4d14051..2d42613 100755 +--- a/desktop/scripts/soffice.sh.in ++++ b/desktop/scripts/soffice.sh.in +@@ -158,8 +158,8 @@ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then + fi + + # do not pass the request for command line help to oosplash +-if test "$#" -eq 1; then +- case "$1" in ++for arg in $@ ; do ++ case "$arg" in + -h | --h | --he | --hel | --help) + "$sd_prog/soffice.bin" --help + exit 0 +@@ -171,7 +171,7 @@ if test "$#" -eq 1; then + *) + ;; + esac +-fi ++done + + # oosplash does the rest: forcing pages in, javaldx etc. are + exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@" diff --git a/0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch b/0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch new file mode 100644 index 0000000..bb6f2d3 --- /dev/null +++ b/0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch @@ -0,0 +1,166 @@ +From 4564f9c207ab53c70a199a2dbcc0d8f155211256 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 6 Mar 2012 12:39:07 +0000 +Subject: [PATCH] Resolves: rhbz#799525 put flat odf mimetypes in + xsltfilter.desktop + +--- + scp2/source/ooo/common_brand.scp | 10 ++++++++++ + sysui/desktop/freedesktop/freedesktop-menus.spec | 1 + + sysui/desktop/menus/calc.desktop | 2 +- + sysui/desktop/menus/draw.desktop | 2 +- + sysui/desktop/menus/impress.desktop | 2 +- + sysui/desktop/menus/writer.desktop | 2 +- + sysui/desktop/menus/xsltfilter.desktop | 9 +++++++++ + sysui/desktop/share/launcher_genericname.ulf | 3 +++ + sysui/desktop/share/makefile.mk | 2 +- + sysui/desktop/suse/suse-menus.spec | 1 + + 10 files changed, 29 insertions(+), 5 deletions(-) + create mode 100644 sysui/desktop/menus/xsltfilter.desktop + +diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp +index 69c0a71..4c594df 100644 +--- a/scp2/source/ooo/common_brand.scp ++++ b/scp2/source/ooo/common_brand.scp +@@ -98,6 +98,7 @@ Module gid_Module_Root_Brand + gid_Brand_File_Share_Xdg_QStart, + gid_Brand_File_Share_Xdg_StartCenter, + gid_Brand_File_Share_Xdg_Writer, ++ gid_Brand_File_Share_Xdg_XsltFilter, + gid_Brand_File_Txt_Package, + gid_License_Txt, + git_License_Odt, +@@ -791,6 +792,15 @@ File gid_Brand_File_Share_Xdg_BinFilter + End + #endif + ++#if defined UNX && ! defined MACOSX ++File gid_Brand_File_Share_Xdg_XsltFilter ++ TXT_FILE_BODY; ++ Dir = gid_Brand_Dir_Share_Xdg; ++ Name = "xsltfilter.desktop"; ++ Styles = (PACKED,SCPZIP_REPLACE); ++End ++#endif ++ + // Profiles + + Profile gid_Brand_Profile_Bootstrap_Ini +diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec +index 78a33ae..039bdc2 100755 +--- a/sysui/desktop/freedesktop/freedesktop-menus.spec ++++ b/sysui/desktop/freedesktop/freedesktop-menus.spec +@@ -387,6 +387,7 @@ done + /usr/share/applications/%unixfilename-startcenter.desktop + /usr/share/applications/%unixfilename-javafilter.desktop + /usr/share/applications/%unixfilename-binfilter.desktop ++/usr/share/applications/%unixfilename-xsltfilter.desktop + /usr/share/icons/gnome/*/apps/*png + /usr/share/icons/gnome/*/mimetypes/*png + /usr/share/icons/hicolor/*/apps/*png +diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop +index c8899cd..b4c0385 100755 +--- a/sysui/desktop/menus/calc.desktop ++++ b/sysui/desktop/menus/calc.desktop +@@ -5,7 +5,7 @@ Icon=calc + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; + Exec=${UNIXBASISROOTNAME} --calc %U +-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;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; ++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; + Name=%PRODUCTNAME Calc + GenericName=Spreadsheet + Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. +diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop +index 67ad422..231f320 100755 +--- a/sysui/desktop/menus/draw.desktop ++++ b/sysui/desktop/menus/draw.desktop +@@ -5,7 +5,7 @@ Icon=draw + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing; + Exec=${UNIXBASISROOTNAME} --draw %U +-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; ++MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template; + Name=%PRODUCTNAME Draw + GenericName=Drawing Program + Comment=Create and edit drawings, flow charts, and logos by using Draw. +diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop +index 91c937a..22d130d 100755 +--- a/sysui/desktop/menus/impress.desktop ++++ b/sysui/desktop/menus/impress.desktop +@@ -5,7 +5,7 @@ Icon=impress + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; + Exec=${UNIXBASISROOTNAME} --impress %U +-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; ++MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; + Name=%PRODUCTNAME Impress + GenericName=Presentation + Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. +diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop +index 0db0d05..845b6d2 100755 +--- a/sysui/desktop/menus/writer.desktop ++++ b/sysui/desktop/menus/writer.desktop +@@ -5,7 +5,7 @@ Icon=writer + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; + Exec=${UNIXBASISROOTNAME} --writer %U +-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; ++MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; + Name=%PRODUCTNAME Writer + GenericName=Word Processor + Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. +diff --git a/sysui/desktop/menus/xsltfilter.desktop b/sysui/desktop/menus/xsltfilter.desktop +new file mode 100644 +index 0000000..a6c3b1b +--- /dev/null ++++ b/sysui/desktop/menus/xsltfilter.desktop +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Version=1.0 ++Terminal=false ++Type=Application ++Exec=${UNIXBASISROOTNAME} %U ++MimeType=application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.presentation-flat-xml; ++Name=%PRODUCTNAME XSLT based filters ++GenericName=XSLT based filters ++NoDisplay=true +diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf +index 6130e0b..09ccf8d 100755 +--- a/sysui/desktop/share/launcher_genericname.ulf ++++ b/sysui/desktop/share/launcher_genericname.ulf +@@ -24,3 +24,6 @@ en-US = "Small Device Format Importer" + + [binfilter] + en-US = "Legacy StarOffice 5 Binary Format Importer" ++ ++[xsltfilter] ++en-US = "XSLT based filters" +diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk +index f6b4dfa..1d99c84 100755 +--- a/sysui/desktop/share/makefile.mk ++++ b/sysui/desktop/share/makefile.mk +@@ -53,7 +53,7 @@ ULFFILES= \ + launcher_name.ulf + + LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter +-LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter ++LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter xsltfilter + LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop + + LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag +diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec +index 74b67e6..ab053ec 100755 +--- a/sysui/desktop/suse/suse-menus.spec ++++ b/sysui/desktop/suse/suse-menus.spec +@@ -358,6 +358,7 @@ done + /usr/share/applications/%unixfilename-startcenter.desktop + /usr/share/applications/%unixfilename-javafilter.desktop + /usr/share/applications/%unixfilename-binfilter.desktop ++/usr/share/applications/%unixfilename-xsltfilter.desktop + /opt/gnome/share/mime-info/*.keys + /opt/gnome/share/mime-info/*.mime + /opt/kde3/share/mimelnk/application/*.desktop +-- +1.7.7.6 + diff --git a/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch b/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch new file mode 100644 index 0000000..a4c5784 --- /dev/null +++ b/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch @@ -0,0 +1,110 @@ +From 4efbd87e31e7488dfcdd1d07ff979f1f59b8b1f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 6 Mar 2012 15:49:20 +0000 +Subject: [PATCH] Resolves: rhbz#800272 complain about unknown command-line + options + +--- + desktop/source/app/cmdlineargs.cxx | 17 ++++++++++++++++- + desktop/source/app/cmdlineargs.hxx | 2 ++ + desktop/source/app/officeipcthread.cxx | 6 ++++++ + desktop/source/app/sofficemain.cxx | 4 ++++ + 4 files changed, 28 insertions(+), 1 deletions(-) + +diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx +index 6a5d58a..5ae86ab 100644 +--- a/desktop/source/app/cmdlineargs.cxx ++++ b/desktop/source/app/cmdlineargs.cxx +@@ -304,6 +304,15 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) + { + bConversionOutEvent = true; + } ++#if defined UNX ++ else ++ { ++ printf("Unknown option %s\n", ++ rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()).getStr()); ++ printf("Run 'soffice --help' to see a full list of available command line options.\n"); ++ SetBoolParam_Impl( CMD_BOOLPARAM_UNKNOWN, sal_True ); ++ } ++#endif + } + else + { +@@ -640,7 +649,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& + + if (bDeprecated) + { +- rtl::OString sArg(rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8)); ++ rtl::OString sArg(rtl::OUStringToOString(aArg, osl_getThreadTextEncoding())); + fprintf(stderr, "Warning: %s is deprecated. Use -%s instead.\n", sArg.getStr(), sArg.getStr()); + } + return sal_True; +@@ -851,6 +860,12 @@ sal_Bool CommandLineArgs::IsVersion() const + return m_aBoolParams[ CMD_BOOLPARAM_VERSION ]; + } + ++sal_Bool CommandLineArgs::HasUnknown() const ++{ ++ osl::MutexGuard aMutexGuard( m_aMutex ); ++ return m_aBoolParams[ CMD_BOOLPARAM_UNKNOWN ]; ++} ++ + sal_Bool CommandLineArgs::HasModuleParam() const + { + osl::MutexGuard aMutexGuard( m_aMutex ); +diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx +index f79efea..29b2f46 100644 +--- a/desktop/source/app/cmdlineargs.hxx ++++ b/desktop/source/app/cmdlineargs.hxx +@@ -71,6 +71,7 @@ class CommandLineArgs + CMD_BOOLPARAM_HELPBASE, + CMD_BOOLPARAM_PSN, + CMD_BOOLPARAM_VERSION, ++ CMD_BOOLPARAM_UNKNOWN, + CMD_BOOLPARAM_COUNT // must be last element! + }; + +@@ -162,6 +163,7 @@ class CommandLineArgs + sal_Bool IsWeb() const; + sal_Bool IsVersion() const; + sal_Bool HasModuleParam() const; ++ sal_Bool HasUnknown() const; + sal_Bool WantsToLoadDocument() const; + + // Access to string parameters +diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx +index b2c6566..4306a67 100644 +--- a/desktop/source/app/officeipcthread.cxx ++++ b/desktop/source/app/officeipcthread.cxx +@@ -709,6 +709,12 @@ void OfficeIPCThread::execute() + #endif + continue; + } ++ ++#ifdef UNX ++ if (aCmdLineArgs->HasUnknown() || aCmdLineArgs->IsVersion() || aCmdLineArgs->IsHelp()) ++ continue; ++#endif ++ + const CommandLineArgs &rCurrentCmdLineArgs = Desktop::GetCommandLineArgs(); + + if ( aCmdLineArgs->IsQuickstart() ) +diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx +index 76562a3..ed22834 100644 +--- a/desktop/source/app/sofficemain.cxx ++++ b/desktop/source/app/sofficemain.cxx +@@ -63,6 +63,10 @@ + desktop::displayVersion(); + return EXIT_SUCCESS; + } ++ else if ( rCmdLineArgs.HasUnknown() ) ++ { ++ return EXIT_FAILURE; ++ } + #endif + return SVMain(); + } +-- +1.7.7.6 + diff --git a/0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch b/0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch new file mode 100644 index 0000000..cb5817a --- /dev/null +++ b/0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch @@ -0,0 +1,91 @@ +From 4ae4c57caab02c5d8fe91cd9956fabba6bd3dc1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 9 May 2012 12:39:28 +0100 +Subject: [PATCH] Resolves: rhbz#805743 a11y: call doShow after we have a + valid view + +Basically a regression from ec240eafe9b25620383aa54015f5c55e0f64227a but things +were broken before that too. + +enable a11y (for gnome 3 this is gsettings set org.gnome.desktop.interface +toolkit-accessibility true), and run the smoketest with dbg-util before +touching this stuff + +Change-Id: I I55f4e22d8ac61c7ac3ccc37b82794604b28a8f14 +--- + .../ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 +- + sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 +- + sd/source/ui/view/drviewsa.cxx | 3 +-- + sd/source/ui/view/outlnvsh.cxx | 4 ++-- + 4 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +index a9b09a9..7b874c0 100644 +--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx ++++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +@@ -186,7 +186,7 @@ void SlideSorterViewShell::Initialize (void) + mpScrollBarBox); + mpView = &mpSlideSorter->GetView(); + +- ViewShell::doShow(); ++ doShow(); + + SetPool( &GetDoc()->GetPool() ); + SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() ); +diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +index 12f6515..8eb9bc7 100644 +--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx ++++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +@@ -482,7 +482,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi + ,mpSubShellManager() + ,mnMenuId(0) + { +- ViewShell::doShow(); ++ doShow(); + + meShellType = ST_TASK_PANE; + +diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx +index 0d1b5ac..1dabda6 100644 +--- a/sd/source/ui/view/drviewsa.cxx ++++ b/sd/source/ui/view/drviewsa.cxx +@@ -137,13 +137,12 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas + , mbIsLayerModeActive(false) + , mbIsInSwitchPage(false) + { +- ViewShell::doShow(); +- + if (pFrameViewArgument != NULL) + mpFrameView = pFrameViewArgument; + else + mpFrameView = new FrameView(GetDoc()); + Construct(GetDocSh(), ePageKind); ++ doShow(); + } + + /************************************************************************* +diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx +index 4f13989..f37b7a0 100644 +--- a/sd/source/ui/view/outlnvsh.cxx ++++ b/sd/source/ui/view/outlnvsh.cxx +@@ -222,8 +222,6 @@ OutlineViewShell::OutlineViewShell ( + mbInitialized(false) + + { +- ViewShell::doShow(); +- + if (pFrameViewArgument != NULL) + mpFrameView = pFrameViewArgument; + else +@@ -232,6 +230,8 @@ OutlineViewShell::OutlineViewShell ( + mpFrameView->Connect(); + + Construct(GetDocSh()); ++ ++ doShow(); + } + + /************************************************************************* +-- +1.7.7.6 + diff --git a/0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch b/0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch new file mode 100644 index 0000000..436ae97 --- /dev/null +++ b/0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch @@ -0,0 +1,26 @@ +From 24b867c1e1d2264ff138d4eafa9791fcd1191160 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 26 Mar 2012 13:53:55 +0100 +Subject: [PATCH] Resolves: rhbz#806663 SlideshowImpl can outlive SdModule + (somehow) + + +diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx +index 3bc8dc1..ed9d76d 100644 +--- a/sd/source/ui/slideshow/slideshowimpl.cxx ++++ b/sd/source/ui/slideshow/slideshowimpl.cxx +@@ -593,7 +593,10 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, + + SlideshowImpl::~SlideshowImpl() + { +- SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); ++ SdModule *pModule = SD_MOD(); ++ //rhbz#806663 SlideshowImpl can outlive SdModule ++ SdOptions* pOptions = pModule ? ++ pModule->GetSdOptions(DOCUMENT_TYPE_IMPRESS) : NULL; + if( pOptions ) + { + pOptions->SetPresentationPenColor(mnUserPaintColor); +-- +1.7.7.6 + diff --git a/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch b/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch new file mode 100644 index 0000000..d434c9b --- /dev/null +++ b/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch @@ -0,0 +1,37 @@ +From 4fc8af89257436b9cad70de574a166aa11ec42f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 9 Jul 2012 12:51:16 +0100 +Subject: [PATCH] Resolves: rhbz#838368 --view ignored while -view accepted + +and our ooviewdoc script uses --view + +Change-Id: Ice708f1c72c8d29d411ba21e93cb19876af13881 +--- + desktop/source/app/cmdlineargs.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx +index af7ee26..c67db8c 100644 +--- a/desktop/source/app/cmdlineargs.cxx ++++ b/desktop/source/app/cmdlineargs.cxx +@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) + bStartEvent = false; + bDisplaySpec = false; + } +- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" ))) ++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" ))) + { + // open in viewmode + bOpenEvent = false; +@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) + bStartEvent = false; + bDisplaySpec = false; + } +- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" ))) ++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" ))) + { + // open in viewmode + bOpenEvent = false; +-- +1.7.10.4 + diff --git a/0001-desktop-do-not-complain-about-soffice-command-line-o.patch b/0001-desktop-do-not-complain-about-soffice-command-line-o.patch new file mode 100644 index 0000000..552b2d3 --- /dev/null +++ b/0001-desktop-do-not-complain-about-soffice-command-line-o.patch @@ -0,0 +1,42 @@ +From db21197de4383f75718190072171adab15e64a00 Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Thu, 8 Mar 2012 15:49:52 +0100 +Subject: [PATCH] desktop: do not complain about soffice command line options: + +These are handled in the soffice wrapper script, but that is too stupid +to be able to filter these out, so just ignore them in soffice.bin. + +(regression from 4efbd87e31e7488dfcdd1d07ff979f1f59b8b1f1) + +Also, print errors on stderr. +--- + desktop/source/app/cmdlineargs.cxx | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx +index 5ae86ab..0bc6312 100644 +--- a/desktop/source/app/cmdlineargs.cxx ++++ b/desktop/source/app/cmdlineargs.cxx +@@ -306,10 +306,17 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) + } + #if defined UNX + else ++ // because it's impossible to filter these options that ++ // are handled in the soffice shell script with the ++ // primitive tools that /bin/sh offers, ignore them here ++ if (!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) && ++ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) && ++ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("nocrashreport")) && ++ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind"))) + { +- printf("Unknown option %s\n", ++ fprintf(stderr, "Unknown option %s\n", + rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()).getStr()); +- printf("Run 'soffice --help' to see a full list of available command line options.\n"); ++ fprintf(stderr, "Run 'soffice --help' to see a full list of available command line options.\n"); + SetBoolParam_Impl( CMD_BOOLPARAM_UNKNOWN, sal_True ); + } + #endif +-- +1.7.7.6 + diff --git a/0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch b/0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch new file mode 100644 index 0000000..a94a66a --- /dev/null +++ b/0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch @@ -0,0 +1,54 @@ +From 032084d8582ef8eb04724d2488f3e381ac8054d2 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 23 Apr 2012 13:19:39 +0200 +Subject: [PATCH] do not let gcc use registers we are setting ourselves + +gcc uses a register for the function call--and it tried r9 here... +--- + .../source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx | 16 +++++++++++++--- + 1 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +index 34e8c63..f409bf7 100644 +--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx ++++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +@@ -67,7 +67,6 @@ static void callVirtualMethod( + // of floating point registers f1 to f8 + + unsigned long * mfunc; // actual function to be invoked +- void (*ptr)(); + int gpr[8]; // storage for gpregisters, map to r3-r10 + int off; // offset used to find function + #ifndef __NO_FPRS__ +@@ -243,7 +242,8 @@ static void callVirtualMethod( + mfunc = *((unsigned long **)pAdjustedThisPtr); // get the address of the vtable + mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset + mfunc = *((unsigned long **)mfunc); // the function is stored at the address +- ptr = (void (*)())mfunc; ++ typedef void (*FunctionCall)(sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32); ++ FunctionCall ptr = (FunctionCall)mfunc; + + /* Set up the machine registers and invoke the function */ + +@@ -272,7 +272,17 @@ static void callVirtualMethod( + : "0", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" + ); + +- (*ptr)(); ++ // tell gcc that r3 to r10 are not available to it for doing the TOC and exception munge on the func call ++ register sal_uInt32 r3 __asm__("r3"); ++ register sal_uInt32 r4 __asm__("r4"); ++ register sal_uInt32 r5 __asm__("r5"); ++ register sal_uInt32 r6 __asm__("r6"); ++ register sal_uInt32 r7 __asm__("r7"); ++ register sal_uInt32 r8 __asm__("r8"); ++ register sal_uInt32 r9 __asm__("r9"); ++ register sal_uInt32 r10 __asm__("r10"); ++ ++ (*ptr)(r3, r4, r5, r6, r7, r8, r9, r10); + + __asm__ __volatile__ ( + "mr %0, 3\n\t" +-- +1.7.7.6 + diff --git a/0001-fdo-38088-better-CSV-import-default-separators.patch b/0001-fdo-38088-better-CSV-import-default-separators.patch new file mode 100644 index 0000000..5279cf1 --- /dev/null +++ b/0001-fdo-38088-better-CSV-import-default-separators.patch @@ -0,0 +1,54 @@ +From f31362eb144153c914f1ae0cdda6fe8312c1152d Mon Sep 17 00:00:00 2001 +Message-Id: +From: Eike Rathke +Date: Wed, 4 Apr 2012 20:17:22 +0200 +Subject: [PATCH] resolved fdo#38088 rhbz#810267 better CSV import default separators +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" + +This is a multi-part message in MIME format. +--------------erAck-patch-parts +Content-Type: text/plain; charset=UTF-8; format=fixed +Content-Transfer-Encoding: 8bit + +--- + .../registry/schema/org/openoffice/Office/Calc.xcs | 2 +- + sc/source/ui/dbgui/scuiasciiopt.cxx | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + + +--------------erAck-patch-parts +Content-Type: text/x-patch; name="0001-fdo-33088-better-CSV-import-default-separators.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="0001-fdo-33088-better-CSV-import-default-separators.patch" + +diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +index 700d716..0cd2ff3 100644 +--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs ++++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +@@ -1063,7 +1063,7 @@ + List of Separators - as a String + + +- ; ++ ,; + + + +diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx +index 93d5cfc..2a3a2b94 100644 +--- a/sc/source/ui/dbgui/scuiasciiopt.cxx ++++ b/sc/source/ui/dbgui/scuiasciiopt.cxx +@@ -268,7 +268,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, + SetText( aName ); + + // Default options +- OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM("\t")); ++ OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM(",;\t")); + OUString sTextSeparators(mcTextSep); + bool bMergeDelimiters = false; + bool bFixedWidth = false; + +--------------erAck-patch-parts-- + + diff --git a/0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch b/0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch new file mode 100644 index 0000000..0d6a301 --- /dev/null +++ b/0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch @@ -0,0 +1,33 @@ +From 6d4cca9c22c52b5a7742adc47ebf1a2930e29764 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 14 Mar 2012 13:58:37 +0100 +Subject: [PATCH] fix setting of paper tray from print dialog (fdo#43932) + +This fixes the simple case when all pages are to be printed from the +same paper tray. The use of this setting is still confusing when there +is application-set tray for a page (e.g., for a page style in Writer, +through Format->Page), because the change in Preferences is applied (and +will be used for pages without application-set tray), but Preferences +shows the application-set value on second try again... + +IOW, it still s---s, but it s---s a bit less .-) +--- + vcl/source/gdi/print3.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx +index 4824203..817e6d5 100644 +--- a/vcl/source/gdi/print3.cxx ++++ b/vcl/source/gdi/print3.cxx +@@ -773,7 +773,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons + PrinterController::PageSize aPageSize; + aPageSize.aSize = mpPrinter->GetPaperSize(); + awt::Size aSetSize, aIsSize; +- sal_Int32 nPaperBin = mnDefaultPaperBin; ++ sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : mnDefaultPaperBin; + for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty ) + { + if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredPageSize" ) ) ) +-- +1.7.7.6 + diff --git a/0001-move-binfilter-mime-types-into-extra-.desktop-file.patch b/0001-move-binfilter-mime-types-into-extra-.desktop-file.patch new file mode 100644 index 0000000..a4acab5 --- /dev/null +++ b/0001-move-binfilter-mime-types-into-extra-.desktop-file.patch @@ -0,0 +1,191 @@ +From 9441e2a015d38968592508782c4041dab5af1bda Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 31 Jan 2012 09:40:57 +0100 +Subject: [PATCH] move binfilter mime types into extra .desktop file + +--- + scp2/source/ooo/common_brand.scp | 9 +++++++++ + sysui/desktop/freedesktop/freedesktop-menus.spec | 1 + + sysui/desktop/menus/binfilter.desktop | 9 +++++++++ + sysui/desktop/menus/calc.desktop | 2 +- + sysui/desktop/menus/draw.desktop | 2 +- + sysui/desktop/menus/impress.desktop | 2 +- + sysui/desktop/menus/math.desktop | 2 +- + sysui/desktop/menus/writer.desktop | 2 +- + sysui/desktop/share/launcher_genericname.ulf | 3 +++ + sysui/desktop/share/makefile.mk | 7 ++++--- + sysui/desktop/suse/suse-menus.spec | 1 + + 11 files changed, 32 insertions(+), 8 deletions(-) + create mode 100644 sysui/desktop/menus/binfilter.desktop + +diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp +index 6c6fb66..9893a60 100644 +--- a/scp2/source/ooo/common_brand.scp ++++ b/scp2/source/ooo/common_brand.scp +@@ -87,6 +87,7 @@ Module gid_Module_Root_Brand + gid_Brand_File_Share_Registry_O5oo_Xcd, + gid_Brand_File_Script_Unopkg, + gid_Brand_File_Share_Xdg_Base, ++ gid_Brand_File_Share_Xdg_BinFilter, + gid_Brand_File_Share_Xdg_Calc, + gid_Brand_File_Share_Xdg_Draw, + gid_Brand_File_Share_Xdg_Extension, +@@ -781,6 +782,14 @@ File gid_Brand_File_Share_Xdg_JavaFilter + End + #endif + ++#if defined UNX && ! defined MACOSX ++File gid_Brand_File_Share_Xdg_BinFilter ++ TXT_FILE_BODY; ++ Dir = gid_Brand_Dir_Share_Xdg; ++ Name = "binfilter.desktop"; ++ Styles = (PACKED,SCPZIP_REPLACE); ++End ++#endif + + // Profiles + +diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec +index d4efca5..78a33ae 100755 +--- a/sysui/desktop/freedesktop/freedesktop-menus.spec ++++ b/sysui/desktop/freedesktop/freedesktop-menus.spec +@@ -386,6 +386,7 @@ done + /usr/share/applications/%unixfilename-writer.desktop + /usr/share/applications/%unixfilename-startcenter.desktop + /usr/share/applications/%unixfilename-javafilter.desktop ++/usr/share/applications/%unixfilename-binfilter.desktop + /usr/share/icons/gnome/*/apps/*png + /usr/share/icons/gnome/*/mimetypes/*png + /usr/share/icons/hicolor/*/apps/*png +diff --git a/sysui/desktop/menus/binfilter.desktop b/sysui/desktop/menus/binfilter.desktop +new file mode 100644 +index 0000000..bfad37f +--- /dev/null ++++ b/sysui/desktop/menus/binfilter.desktop +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Version=1.0 ++Terminal=false ++Type=Application ++Exec=${UNIXBASISROOTNAME} %U ++MimeType=application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.draw;application/vnd.stardivision.impress;application/vnd.stardivision.math;application/vnd.stardivision.writer; ++Name=%PRODUCTNAME Legacy StarOffice 5 Binary Format Importer ++GenericName=Legacy StarOffice 5 Binary Format Importer ++NoDisplay=true +diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop +index 696385a..c8899cd 100755 +--- a/sysui/desktop/menus/calc.desktop ++++ b/sysui/desktop/menus/calc.desktop +@@ -5,7 +5,7 @@ Icon=calc + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; + Exec=${UNIXBASISROOTNAME} --calc %U +-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;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; ++MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;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; + Name=%PRODUCTNAME Calc + GenericName=Spreadsheet + Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. +diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop +index 96234c6..67ad422 100755 +--- a/sysui/desktop/menus/draw.desktop ++++ b/sysui/desktop/menus/draw.desktop +@@ -5,7 +5,7 @@ Icon=draw + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing; + Exec=${UNIXBASISROOTNAME} --draw %U +-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.stardivision.draw; ++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; + Name=%PRODUCTNAME Draw + GenericName=Drawing Program + Comment=Create and edit drawings, flow charts, and logos by using Draw. +diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop +index 92060e3..91c937a 100755 +--- a/sysui/desktop/menus/impress.desktop ++++ b/sysui/desktop/menus/impress.desktop +@@ -5,7 +5,7 @@ Icon=impress + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; + Exec=${UNIXBASISROOTNAME} --impress %U +-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; ++MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; + Name=%PRODUCTNAME Impress + GenericName=Presentation + Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. +diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop +index 61bade6..23e2d87 100755 +--- a/sysui/desktop/menus/math.desktop ++++ b/sysui/desktop/menus/math.desktop +@@ -6,7 +6,7 @@ Icon=math + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; + Exec=${UNIXBASISROOTNAME} --math %U +-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math; ++MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math; + Name=%PRODUCTNAME Math + GenericName=Formula Editor + Comment=Create and edit scientific formulas and equations by using Math. +diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop +index 625df59..0db0d05 100755 +--- a/sysui/desktop/menus/writer.desktop ++++ b/sysui/desktop/menus/writer.desktop +@@ -5,7 +5,7 @@ Icon=writer + Type=Application + Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; + Exec=${UNIXBASISROOTNAME} --writer %U +-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; ++MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; + Name=%PRODUCTNAME Writer + GenericName=Word Processor + Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. +diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf +index ff8041a..6130e0b 100755 +--- a/sysui/desktop/share/launcher_genericname.ulf ++++ b/sysui/desktop/share/launcher_genericname.ulf +@@ -21,3 +21,6 @@ en-US = "Office" + + [javafilter] + en-US = "Small Device Format Importer" ++ ++[binfilter] ++en-US = "Legacy StarOffice 5 Binary Format Importer" +diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk +index f6a34b1..f6b4dfa 100755 +--- a/sysui/desktop/share/makefile.mk ++++ b/sysui/desktop/share/makefile.mk +@@ -52,7 +52,8 @@ ULFFILES= \ + launcher_genericname.ulf \ + launcher_name.ulf + +-LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter javafilter ++LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter ++LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter + LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop + + LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag +@@ -126,9 +127,9 @@ MIMEICONLIST = \ + extension + + ICONDEPN = \ +- ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \ ++ ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST_APPS)}.png \ + ../icons/hicolor/{16x16 32x32 48x48}/mimetypes/{$(MIMEICONLIST)}.png \ +- ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \ ++ ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST_APPS)}.png \ + ../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png + + # --- Targets ------------------------------------------------------ +diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec +index ea5ae31..74b67e6 100755 +--- a/sysui/desktop/suse/suse-menus.spec ++++ b/sysui/desktop/suse/suse-menus.spec +@@ -357,6 +357,7 @@ done + /usr/share/applications/%unixfilename-printeradmin.desktop + /usr/share/applications/%unixfilename-startcenter.desktop + /usr/share/applications/%unixfilename-javafilter.desktop ++/usr/share/applications/%unixfilename-binfilter.desktop + /opt/gnome/share/mime-info/*.keys + /opt/gnome/share/mime-info/*.mime + /opt/kde3/share/mimelnk/application/*.desktop +-- +1.7.7.5 + diff --git a/0001-preserve-timestamps-for-.py-files.patch b/0001-preserve-timestamps-for-.py-files.patch new file mode 100644 index 0000000..88aefa5 --- /dev/null +++ b/0001-preserve-timestamps-for-.py-files.patch @@ -0,0 +1,28 @@ +From 18af7e03d81d295a47457486d3036681bd17eb81 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 13 Feb 2012 10:45:59 +0000 +Subject: [PATCH] preserve timestamps for .py files + +.pyc and .pyo binary caches contain the timestamp of the .py file, so for +fedora multilib if the .py files get different times on different arch then the +.py[o|c] files end up being different for the same content +--- + solenv/bin/install-gdb-printers | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers +index 99686cf..df327a0 100755 +--- a/solenv/bin/install-gdb-printers ++++ b/solenv/bin/install-gdb-printers +@@ -165,7 +165,7 @@ fi + + if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then + mkdir -p "${DESTDIR}${pythondir}" || die "cannot create dir '${DESTDIR}${pythondir}'" +- cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" ++ cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" + fi + + make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 +-- +1.7.7.6 + diff --git a/0001-resolved-rhbz-838248-init-filter-criteria-string.patch b/0001-resolved-rhbz-838248-init-filter-criteria-string.patch new file mode 100644 index 0000000..46ba87b --- /dev/null +++ b/0001-resolved-rhbz-838248-init-filter-criteria-string.patch @@ -0,0 +1,72 @@ +From 22ccbeef9c88b01ac841de37dfcb5985dc05a530 Mon Sep 17 00:00:00 2001 +Message-Id: <22ccbeef9c88b01ac841de37dfcb5985dc05a530.1341913622.git.erack@redhat.com> +From: Eike Rathke +Date: Mon, 9 Jul 2012 18:31:30 +0200 +Subject: [PATCH] resolved rhbz#838248 init filter criteria string +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" + +This is a multi-part message in MIME format. +--------------erAck-patch-parts +Content-Type: text/plain; charset=UTF-8; format=fixed +Content-Transfer-Encoding: 8bit + + +In ScFilterDlg::Init() the string displayed as criteria was empty if +query is ByValue or ByDate. From earlier times the dialog assumed that +the query string was always set corresponding to the value, but internal +handling was changed. + +Change-Id: I4f10654f4015b38f7ddba9d6727e06806f1d6b77 +Signed-off-by: Kohei Yoshida +--- + sc/source/ui/dbgui/filtdlg.cxx | 26 +++++++++++++++++++++++++- + 1 files changed, 25 insertions(+), 1 deletions(-) + + +--------------erAck-patch-parts +Content-Type: text/x-patch; name="0001-resolved-rhbz-838248-init-filter-criteria-string.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="0001-resolved-rhbz-838248-init-filter-criteria-string.patch" + +diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx +index 93ad302..c744d85 100644 +--- a/sc/source/ui/dbgui/filtdlg.cxx ++++ b/sc/source/ui/dbgui/filtdlg.cxx +@@ -318,7 +318,31 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) + maCondLbArr[i]->Disable(); + } + else +- aValStr = rItem.maString; ++ { ++ if (rItem.maString.isEmpty()) ++ { ++ if (rItem.meType == ScQueryEntry::ByValue) ++ pDoc->GetFormatTable()->GetInputLineString( rItem.mfVal, 0, aValStr); ++ else if (rItem.meType == ScQueryEntry::ByDate) ++ { ++ SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); ++ pFormatter->GetInputLineString( rItem.mfVal, ++ pFormatter->GetStandardFormat( NUMBERFORMAT_DATE), aValStr); ++ } ++ else ++ { ++ SAL_WARN( "sc", "ScFilterDlg::Init: empty query string, really?"); ++ aValStr = rItem.maString; ++ } ++ } ++ else ++ { ++ // XXX NOTE: if not ByString we just assume this has been ++ // set to a proper string corresponding to the numeric ++ // value earlier! ++ aValStr = rItem.maString; ++ } ++ } + } + else if ( i == 0 ) + { + +--------------erAck-patch-parts-- + + diff --git a/0001-save-register-arguments-first.patch b/0001-save-register-arguments-first.patch new file mode 100644 index 0000000..dd5989d --- /dev/null +++ b/0001-save-register-arguments-first.patch @@ -0,0 +1,57 @@ +From f4c5fe13fd1484aa1bf37910841c689877740602 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 23 Apr 2012 09:47:41 +0200 +Subject: [PATCH] save register arguments first + +The "mr" stores r11 to indeterminate register (r9 in my case) before +storing it into the output variable, thus overwriting one of our input +arguments... This later leads to nice segfault in +testtools/source/bridgetest ... + +I suppose there is a better way to get the variable, but I do not know +it .-) +--- + .../cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +index 425c5b5..3cb94dd 100644 +--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx ++++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +@@ -504,13 +504,6 @@ static typelib_TypeClass cpp_mediate( + + extern "C" void privateSnippetExecutor( ... ) + { +- volatile long nOffsetAndIndex; +- +- //mr %r3, %r11 # move into arg1 the 64bit value passed from OOo +- __asm__ __volatile__ ( +- "mr %0, 11\n\t" +- : "=r" (nOffsetAndIndex) : ); +- + sal_uInt64 gpreg[ppc64::MAX_GPR_REGS]; + double fpreg[ppc64::MAX_SSE_REGS]; + +@@ -537,11 +530,18 @@ extern "C" void privateSnippetExecutor( ... ) + "stfd 12, 88(%1)\t\n" + "stfd 13, 96(%1)\t\n" + : : "r" (gpreg), "r" (fpreg) +- : "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", ++ : "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", + "fr1", "fr2", "fr3", "fr4", "fr5", "fr6", "fr7", "fr8", "fr9", + "fr10", "fr11", "fr12", "fr13" + ); + ++ volatile long nOffsetAndIndex; ++ ++ //mr %r3, %r11 # move into arg1 the 64bit value passed from OOo ++ __asm__ __volatile__ ( ++ "mr %0, 11\n\t" ++ : "=r" (nOffsetAndIndex) : ); ++ + volatile long sp; + + //stack pointer +-- +1.7.7.6 + diff --git a/0001-use-ure-instead-of-ure-link.patch b/0001-use-ure-instead-of-ure-link.patch new file mode 100644 index 0000000..8552406 --- /dev/null +++ b/0001-use-ure-instead-of-ure-link.patch @@ -0,0 +1,28 @@ +From 0acbbeaeeb8ef0221dbef6d6bbdea94394d79a59 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 11 Jun 2012 14:09:39 +0200 +Subject: [PATCH] use ure instead of ure-link + +Change-Id: I5368770926aee871e20b2d87fa51b28212c8be4f +--- + solenv/bin/install-gdb-printers | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers +index c478929..51ab9e2 100755 +--- a/solenv/bin/install-gdb-printers ++++ b/solenv/bin/install-gdb-printers +@@ -168,8 +168,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then + cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" + fi + +-make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 +-make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 ++make_autoload cppu ure/lib libuno_cppu."$DYLIB".3 ++make_autoload sal ure/lib libuno_sal."$DYLIB".3 + make_autoload svl program libsvllo."$DYLIB" + make_autoload sw program libswlo."$DYLIB" + make_autoload tl program libtllo."$DYLIB" +-- +1.7.10.2 + diff --git a/0001-wrong-types-used-here-breaks-64bit-bigendian.patch b/0001-wrong-types-used-here-breaks-64bit-bigendian.patch new file mode 100644 index 0000000..f48c6ea --- /dev/null +++ b/0001-wrong-types-used-here-breaks-64bit-bigendian.patch @@ -0,0 +1,43 @@ +From 78719066cb546c7dc74e87488b9b7a695606cf7c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 6 Mar 2012 09:37:35 +0000 +Subject: [PATCH] wrong types used here, breaks 64bit bigendian + +--- + sw/qa/core/Test-BigPtrArray.cxx | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx +index 7953dc3..d9be7a2 100644 +--- a/sw/qa/core/Test-BigPtrArray.cxx ++++ b/sw/qa/core/Test-BigPtrArray.cxx +@@ -82,7 +82,7 @@ namespace /* private */ + sal_Bool AddToCount(const ElementPtr& rElem, void* pArgs) + { + BigPtrEntryMock* const pbem = static_cast(rElem); +- pbem->setCount(pbem->getCount() + *((int*)pArgs)); ++ pbem->setCount(pbem->getCount() + *((sal_uLong*)pArgs)); + return true; + } + +@@ -655,7 +655,7 @@ public: + fillBigPtrArray(bparr, NUM_ENTRIES); + dumpBigPtrArray(bparr); + +- int addCount = 1; ++ sal_uLong addCount = 1; + bparr.ForEach(AddToCount, &addCount); + + for (sal_uLong i = 0; i < NUM_ENTRIES; i++) +@@ -715,7 +715,7 @@ public: + fillBigPtrArray(bparr, NUM_ENTRIES); + dumpBigPtrArray(bparr); + +- int addCount = 1; ++ sal_uLong addCount = 1; + bparr.ForEach(NUM_ENTRIES / 2, NUM_ENTRIES, AddToCount, &addCount); + + sal_uLong i = 0; +-- +1.7.7.6 + diff --git a/disable-qtunixeventloop.patch b/disable-qtunixeventloop.patch deleted file mode 100644 index ccd035d..0000000 --- a/disable-qtunixeventloop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vcl/unx/kde4/KDEXLib.cxx 2011-09-19 15:55:17.000000000 +0000 -+++ ./vcl/unx/kde4/KDEXLib.cxx 2011-09-19 15:55:34.000000000 +0000 -@@ -58,7 +58,7 @@ - #include - - #if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 1 ) --#define QT_UNIX_EVENT_LOOP_SUPPORT -+// #define QT_UNIX_EVENT_LOOP_SUPPORT - #ifdef KDE_HAVE_GLIB - #define GLIB_EVENT_LOOP_SUPPORT - #endif diff --git a/glib2.31.patch b/glib2.31.patch deleted file mode 100644 index 2039a17..0000000 --- a/glib2.31.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./ucb/source/ucp/gvfs/gvfs_content.hxx 2011-11-04 18:24:28.000000000 +0000 -+++ ./ucb/source/ucp/gvfs/gvfs_content.hxx 2011-11-04 18:50:10.000000000 +0000 -@@ -35,7 +35,7 @@ - #include - #include - --#include -+#include - #include - #include - diff --git a/libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch b/libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch deleted file mode 100644 index 1a6ca6a..0000000 --- a/libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx.ark 2012-01-31 19:11:16.582876303 +0100 -+++ libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-01-31 19:11:37.026875942 +0100 -@@ -57,6 +57,7 @@ - - //kde has an enum that uses this...OO does too - #undef SETTINGS_MOUSE -+#undef SETTINGS_LOCALE - - #include - #include diff --git a/libreoffice-ensure-non-broken-xml-tree.patch b/libreoffice-ensure-non-broken-xml-tree.patch new file mode 100644 index 0000000..dc8a23a --- /dev/null +++ b/libreoffice-ensure-non-broken-xml-tree.patch @@ -0,0 +1,119 @@ +diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk +index 65d5a80..b544f74 100644 +--- a/solenv/gbuild/gbuild.mk ++++ b/solenv/gbuild/gbuild.mk +@@ -313,6 +313,14 @@ gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc) + gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET) + endif + ++ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES) ++gb_XMLLINTTARGET := ++gb_XMLLINT := xsltproc ++else ++gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc) ++gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET) ++endif ++ + ifeq ($(SYSTEM_PYTHON),YES) + gb_PYTHONTARGET := + gb_PYTHON := $(PYTHON) +diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk +index 0418fc1..4de797c 100644 +--- a/solenv/inc/unitools.mk ++++ b/solenv/inc/unitools.mk +@@ -41,6 +41,14 @@ + XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc + .ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" + ++.IF "$(XMLLINT)"=="" ++.IF "$(SYSTEM_LIBXML)"!="YES" ++XMLLINT=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmllint ++.ELSE # "$(SYSTEM_LIBXML)"!="YES" ++XMLLINT=$(AUGMENT_LIBRARY_PATH) xmllint ++.ENDIF # "$(SYSTEM_LIBXML)"!="YES" ++.ENDIF ++ + ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv + + MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend +diff --git a/translations/source/nn/helpcontent2/source/text/scalc.po b/translations/source/nn/helpcontent2/source/text/scalc.po +index 9105195..d8573a3 100644 +--- a/translations/source/nn/helpcontent2/source/text/scalc.po ++++ b/translations/source/nn/helpcontent2/source/text/scalc.po +@@ -179,7 +179,7 @@ msgstr "Biletlinja blir vist når du set inn eller + + #: main0203.xhp#tit.help.text + msgid "Drawing Object Properties Bar" +-msgstr "Linja Eigenskapar for teikneobjekt" ++msgstr "Linja \"Eigenskapar for teikneobjekt\"" + + #: main0203.xhp#hd_id3154346.1.help.text + msgid "Drawing Object Properties Bar" +@@ -207,7 +207,7 @@ msgstr "Bak + + #: main0210.xhp#tit.help.text + msgid "Page Preview Bar" +-msgstr "Linja Førehandsvis sida" ++msgstr "Linja \"Førehandsvis sida\"" + + #: main0210.xhp#hd_id3156023.1.help.text + msgid "Page Preview Bar" +diff --git a/translations/source/nn/helpcontent2/source/text/swriter.po b/translations/source/nn/helpcontent2/source/text/swriter.po +index 80768e6..4aaf28f 100644 +--- a/translations/source/nn/helpcontent2/source/text/swriter.po ++++ b/translations/source/nn/helpcontent2/source/text/swriter.po +@@ -516,7 +516,7 @@ msgstr "Desse hjelpeemna er tilgjengelege for menyar og dialogvindauge." + + #: main0205.xhp#tit.help.text + msgid "Drawing Object Properties Bar" +-msgstr "Verktøylinja Eigenskapar for teikneobjekt" ++msgstr "Verktøylinja \"Eigenskapar for teikneobjekt\" + + #: main0205.xhp#hd_id3154275.1.help.text + msgid "Drawing Object Properties Bar" +@@ -597,7 +597,7 @@ msgstr "Dette er ei oversikt over verktøylinjene i $[officename] Writer.Tabell" ++msgstr "Verktøylinja \"Tabell\"" + + #: main0204.xhp#hd_id3145587.1.help.text + msgid "Table Bar" +diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl +index 8dc7bf4..80befc2 100644 +--- a/helpcontent2/helpers/update_tree.pl ++++ b/helpcontent2/helpers/update_tree.pl +@@ -46,6 +46,7 @@ terminate() if ( ! defined $inpath ); + + my $destpath = $inpath; + my $with_lang = $ENV{WITH_LANG}; ++my $xmllint = $ENV{XMLLINT}; + + + # Always use / directory separators +@@ -308,6 +309,7 @@ sub processtreefiles { + unlink "$tree_dest/$lng/$tv" ; + my $ret=mv $treetmpfile , "$tree_dest/$lng/$tv$inpath" or &terminate("Cannot write to $tree_dest/$lng/$tv$inpath - Error $!"); + my $ret=mv "$tree_dest/$lng/$tv$inpath" , "$tree_dest/$lng/$tv" or &terminate("Cannot write to $tree_dest/$lng/$tv - Error $!"); ++ system("$xmllint --noout --noent $tree_dest/$lng/$tv") == 0 or &terminate("$tree_dest/$lng/$tv is illformed xml (xmllint)" ); + } + } else { + &terminate("Cannot write to $tvout"); +diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk +index 45ab373..049879b 100644 +--- a/helpcontent2/source/auxiliary/makefile.mk ++++ b/helpcontent2/source/auxiliary/makefile.mk +@@ -60,9 +60,11 @@ aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$ + aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL)))) + + WITH_LANG!:=$(aux_alllangiso) +- + .EXPORT : WITH_LANG + ++XMLLINT !:=$(XMLLINT) ++.EXPORT : XMLLINT ++ + LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j)) + .ELSE #IF "$(WITH_LANG)"!="" + aux_langdirs:=en-US diff --git a/libreoffice-installfix.patch b/libreoffice-installfix.patch new file mode 100644 index 0000000..3b99656 --- /dev/null +++ b/libreoffice-installfix.patch @@ -0,0 +1,10 @@ +--- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000 ++++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000 +@@ -403,7 +403,6 @@ + { + $installdir = installer::systemactions::create_directories("install", $languageref); + installer::logger::print_message( "... creating installation set in $installdir ...\n" ); +- remove_old_installation_sets($installdir); + my $inprogressinstalldir = $installdir . "_inprogress"; + installer::systemactions::rename_directory($installdir, $inprogressinstalldir); + $installdir = $inprogressinstalldir; diff --git a/libreoffice-multiliblauncher.sh b/libreoffice-multiliblauncher.sh new file mode 100755 index 0000000..08f3300 --- /dev/null +++ b/libreoffice-multiliblauncher.sh @@ -0,0 +1,16 @@ +#!/bin/sh +OOO_ARCH=$(uname -m) +case $OOO_ARCH in + x86_64 | s390x | sparc64 | ppc64) + OOO_LIB_DIR="/usr/lib64" + SECONDARY_LIB_DIR="/usr/lib" + ;; + * ) + OOO_LIB_DIR="/usr/lib" + SECONDARY_LIB_DIR="/usr/lib64" + ;; +esac +if [ ! -x $OOO_LIB_DIR/BRAND/program/LAUNCHER ]; then + OOO_LIB_DIR="$SECONDARY_LIB_DIR" +fi +exec $OOO_LIB_DIR/BRAND/program/LAUNCHER "$@" diff --git a/libreoffice.rpmlintrc b/libreoffice.rpmlintrc index b379584..33f0e5c 100644 --- a/libreoffice.rpmlintrc +++ b/libreoffice.rpmlintrc @@ -23,3 +23,21 @@ addFilter('E: invalid-desktopfile') # FIXME: Dependencies of the l10n packages should be sorted out better # Not a priority though because directory dependencies work addFilter('E: no-dependency-on') + +# FIXME: +addFilter('E: script-without-shebang') + +# libreoffice-base.x86_64: E: outside-libdir-files (Badness: 1) /usr/bin/lobase +# libreoffice-calc.x86_64: E: outside-libdir-files (Badness: 1) /usr/share/icons/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg +# libreoffice-common.x86_64: E: outside-libdir-files (Badness: 1) /usr/share/icons/gnome/48x48/mimetypes/libreoffice-oasis-spreadsheet.png +# libreoffice-draw.x86_64: E: outside-libdir-files (Badness: 1) /usr/bin/lodraw +# libreoffice-impress.x86_64: E: outside-libdir-files (Badness: 1) /usr/share/icons/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg +# libreoffice-math.x86_64: E: outside-libdir-files (Badness: 1) /usr/bin/lomath +# libreoffice-writer.x86_64: E: outside-libdir-files (Badness: 1) /usr/bin/loweb +# /usr/bin files for start up libreoffice apps then does not makes sense being +# considerated as libdir-files +addFilter('E: outside-libdir-files') + +# openoffice.org64 in the core package conflicts +addFilter('E: incoherent-version-in-name') + diff --git a/libreoffice.spec b/libreoffice.spec index cc631ce..c10f099 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,3655 +1,1183 @@ %define _enable_debug_packages %{nil} %define debug_package %{nil} -%define l10n 1 -%{?_with_l10n: %global l10n 1} -%{?_without_l10n: %global l10n 0} +%define libo_version 3.5.6 +# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF +%define __jar_repack %{nil} +# don't worry about whitespace for now +%define _default_patch_flags -s -l +%define _default_patch_fuzz 2 +%define Werror_cflags %nil +%define vendoroption --with-vendor="ROSA" +# undef to get english only and no-langpacks for a faster smoketest build +%define langpacks 1 -%define javaless 1 +# make it easier to download sources from pre-release site +# http://dev-builds.libreoffice.org/pre-releases/src +%define source_url http://download.documentfoundation.org/libreoffice/src/%{libo_version}/ -%define ooname libreoffice -%define name libreoffice - -#define _binary_payload w1.gzdio -#define _binary_payload w9.bzdio -#define _binary_payload w9.lzdio -#define _source_payload w9.bzdio -%define _binary_payload w1.gzdio -%define _source_payload w1.gzdio - -%define version 3.4.5 -%define release %mkrel 1 - -%define buildver 3.4.5.2 -%define basis basis3.4 -%define jdkver 1_5_0_11 -%define ooodir %{_libdir}/libreoffice -%define libdbver 4.2 -%if %l10n -%define langs "en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru sh si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu" +# whether to use stlport or gcc's stl, we're basically locked to stlport for +# i386 to support third party uno components and add-ons designed to work with +# vanilla OOo. +%ifarch %{ix86} +%define stlport_abi_lockin 1 %else -%define langs "en-US" +%define stlport_abi_lockin 0 %endif -%define firefox_plugin libnpsoplugin.so - -%define oootarext bz2 - -%ifarch x86_64 -%define distroname Mandriva64 -%define jdkver 1.4.2 -%define libsuffix lx +%if %{stlport_abi_lockin} +%define stlflags --with-stlport %else -%define distroname Mandriva -%define jdkver 1_5_0_11 -%define libsuffix li +%define stlflags --without-stlport %endif -%define use_icecream 0 -%{?_with_icecream: %global use_icecream 1} -%{?_without_icecream: %global use_icecream 0} +%if %{langpacks} +%define langpack_langs en-US af ar as bg bn ca cs cy da de dz el es et eu fi fr ga gl gu he hi hr hu it ja ko kn lt mai ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru sh si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-CN zh-TW zu +%define with_lang --with-lang="%{langpack_langs}" +%else +%define langpack_langs en-US +%define with_lang '' +%endif -%define use_ccache 0 -%define ccachedir ~/.ccache-OOo -%{?_with_ccache: %global use_ccache 1} -%{?_without_ccache: %global use_ccache 0} - -%define use_smp 1 -%{?_with_smp: %global use_smp 1} -%{?_without_smp: %global use_smp 0} - -%define use_mono 0 -%{?_with_mono: %global use_mono 1} -%{?_without_mono: %global use_mono 0} - -# main cleanup -%define use_openclipart 0 -%{?_with_clipart: %global use_openclipart 1} -%{?_without_clipart: %global use_openclipart 0} - -%define use_systemdb 1 -%{?_with_systemdb: %global use_systemdb 1} -%{?_without_systemdb: %global use_systemdb 0} - -%define use_systemboost 1 -%{?_with_systemboost: %global use_systemboost 1} -%{?_without_systemboost: %global use_systemboost 0} - -# (fix to avoid gcc 4.0.2 produces segfaulting javaldx bin which breaks -# building process) -%define optsafe "" -%define _requires_exceptions libjawt.so\\|libmyspell.so\\|libstlport_gcc.so\\|libmono.so\\|mono +%define _requires_exceptions libjawt.so\\|libmyspell.so\\|libstlport_gcc.so\\|libmono.so\\|mono\\|devel(libstlport_gcc)\\|libxmlreader.so\\|libcomphelp4gcc3.so %define _provides_exceptions libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 -%define unopkg %{_bindir}/unopkg +%bcond_without binfilter -Summary: Office suite -Name: %{name} -Epoch: 1 -Version: %{version} -Release: %{release} -URL: http://www.libreoffice.org -License: LGPL -Group: Office -Vendor: Mandriva -# Requres to all our packages -Requires: %{name}-base = %{EVRD} -Requires: %{name}-calc = %{EVRD} -Requires: %{name}-draw = %{EVRD} -Requires: %{name}-impress = %{EVRD} -Requires: %{name}-math = %{EVRD} -Requires: %{name}-writer = %{EVRD} -# Suggests: %{name}-dtd-officedocument1.0 = %{version} -Suggests: %{name}-pdfimport = %{EVRD} -Obsoletes: %{ooname}-go-ooo <= %{version} -%ifarch x86_64 -Obsoletes: openoffice.org64 <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo < 3.1-4 -%endif -Provides: LibreOffice -Provides: LibreOffice-libs -Obsoletes: openoffice.org < 1:3.3-1:2011.0 +%define subrel 2 -# Requirements for building -%if %{use_icecream} -BuildRequires: icecream -%endif -%if %{use_ccache} -BuildRequires: ccache -%endif -BuildRequires: automake1.8 -BuildRequires: autoconf -%if %{use_systemboost} -BuildRequires: boost-devel -%endif -BuildRequires: bison >= 1.32-2mdk -%if %{use_openclipart} -BuildRequires: clipart-openclipart -%endif -BuildRequires: cups-devel -BuildRequires: dbus-devel >= 0.60 -BuildRequires: ed -BuildRequires: expat-devel -BuildRequires: flex -BuildRequires: freetype2-devel >= 2.1.3-3mdk -BuildRequires: gcc >= 3.2-0.3mdk -BuildRequires: gcc-c++ >= 3.2-0.3mdk -BuildRequires: glitz-devel -BuildRequires: gnutls-devel -BuildRequires: gnome-vfsmm2.6-devel -BuildRequires: gperf -BuildRequires: imagemagick -%if %{use_systemdb} -%if %mdkversion < 201020 -# this is pulled by db-devel >= 4.8, and libdbcxx?.? does not provide libdbcxx at all -BuildRequires: libdbcxx >= 4.2.5-4mdk -%endif -BuildRequires: db-devel >= 4.2.5-4mdk -%else -BuildConflicts: libdbjava4.2 -%endif -BuildRequires: curl-devel -BuildRequires: gtk+2-devel pkgconfig(gdk-pixbuf-xlib-2.0) -BuildRequires: libsvg-devel -BuildRequires: libgstreamer-plugins-base-devel -BuildRequires: xaw-devel -BuildRequires: openldap-devel -BuildRequires: portaudio0-devel >= 18.1 -BuildRequires: sndfile-devel -BuildRequires: unixODBC-devel -BuildRequires: libxslt-proc >= 1.0.19 -BuildRequires: libxslt-devel -BuildRequires: libxml2-devel >= 2.4.23 -%if %{use_mono} -BuildRequires: mono-devel -BuildRequires: mono-data-sqlite -%endif -BuildRequires: nss-devel -BuildRequires: nspr-devel -BuildRequires: nas-devel -BuildRequires: neon-devel >= 0.27 -BuildRequires: pam-devel -BuildRequires: perl -BuildRequires: perl-Archive-Zip -BuildRequires: perl-MDK-Common -BuildRequires: perl-HTML-Parser -BuildRequires: perl-XML-Twig -BuildRequires: python-devel -BuildRequires: readline-devel -BuildRequires: recode -BuildRequires: sane-devel -BuildRequires: sharutils -BuildRequires: startup-notification-devel -%if %{oootarext} == "lzma" -BuildRequires: lzma -BuildRequires: tar >= 1.15.1-7mdk -%endif -BuildRequires: tcsh >= 6.12-2mdk -BuildRequires: unzip -BuildRequires: XFree86 -BuildRequires: x11-server-xvfb -BuildRequires: xpm-devel -BuildRequires: zlib-devel -BuildRequires: zip -BuildRequires: libwpd-devel >= 0.9.0 -BuildRequires: libwpg-devel -BuildRequires: libwps-devel -BuildRequires: icu -BuildRequires: icu-devel -BuildRequires: xulrunner-devel -BuildRequires: libvigra-devel -BuildRequires: hunspell-devel -BuildRequires: %{mklibname poppler-devel} -BuildRequires: %{mklibname poppler-glib-devel} -BuildRequires: %{mklibname poppler-cpp-devel} -BuildRequires: %{mklibname xtst-devel} -BuildRequires: desktop-file-utils -BuildRequires: mesaglu-devel -BuildRequires: qt4-devel -BuildRequires: task-kde4-devel -BuildRequires: cppunit-devel -BuildRequires: redland-devel -%if !%javaless -BuildRequires: ant -BuildRequires: hsqldb -BuildRequires: jakarta-commons-codec -BuildRequires: jakarta-commons-lang -BuildRequires: jakarta-commons-httpclient -%endif -BuildRequires: graphite2-devel -BuildRequires: textcat-devel -BuildRequires: python-translate >= 1.9.0 -# STLport-devel 4.5 + private patches are needed -BuildConflicts: STLport-devel -BuildRequires: java-devel -BuildRequires: pkgconfig(ORBit-2.0) -# recent enough rpm with broken unpackaged subpackage check no longer erroring out -BuildRequires: rpm-build >= 1:5.4.4-27 -# BuildRequires: jakarta-commons-logging +Name: libreoffice +Version: %{libo_version}.2 +Release: 0 +Summary: Free Software Productivity Suite +License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain +Group: Office +URL: http://www.documentfoundation.org/develop -#################################################################### -# -# Sources -# -#################################################################### -Source0: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-artwork-%{buildver}.tar.%{oootarext} -Source1: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-base-%{buildver}.tar.%{oootarext} -Source2: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-bootstrap-%{buildver}.tar.%{oootarext} -Source3: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-calc-%{buildver}.tar.%{oootarext} -Source4: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-components-%{buildver}.tar.%{oootarext} -Source5: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-extensions-%{buildver}.tar.%{oootarext} -Source6: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-extras-%{buildver}.tar.%{oootarext} -Source7: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-filters-%{buildver}.tar.%{oootarext} -Source8: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-help-%{buildver}.tar.%{oootarext} -Source9: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-impress-%{buildver}.tar.%{oootarext} -Source10: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-libs-core-%{buildver}.tar.%{oootarext} -Source11: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-libs-extern-%{buildver}.tar.%{oootarext} -Source12: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-libs-extern-sys-%{buildver}.tar.%{oootarext} -Source13: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-libs-gui-%{buildver}.tar.%{oootarext} -Source14: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-postprocess-%{buildver}.tar.%{oootarext} -Source15: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-sdk-%{buildver}.tar.%{oootarext} -Source16: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-testing-%{buildver}.tar.%{oootarext} -Source17: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-ure-%{buildver}.tar.%{oootarext} -Source18: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-writer-%{buildver}.tar.%{oootarext} -Source19: http://download.documentfoundation.org/libreoffice/src/%version/%{ooname}-translations-%{buildver}.tar.%{oootarext} +Source0: %{source_url}/libreoffice-core-%{version}.tar.xz +Source1: %{source_url}/libreoffice-binfilter-%{version}.tar.xz +Source2: %{source_url}/libreoffice-help-%{version}.tar.xz +Source3: %{source_url}/libreoffice-translations-%{version}.tar.xz +Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Source5: redhat-langpacks.tar.gz +Source6: libreoffice-multiliblauncher.sh +Source7: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +Source8: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +Source9: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +Source10: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +Source11: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Source12: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +Source13: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz +#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose +#backwards compatability. +Source14: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source15: http://dev-www.libreoffice.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 +#Old Mandriva/ROSA patch Source20: Mandriva-Rosa_Icons.tar.bz2 +Source21: %{source_url}/libreoffice-dictionaries-%{version}.tar.xz -Source31: http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz -Source32: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -Source36: http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 -Source37: http://download.go-oo.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz -Source38: http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz -Source39: http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll -Source40: http://hg.services.openoffice.org/binaries/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz -Source42: http://hg.services.openoffice.org/binaries/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz -Source43: http://hg.services.openoffice.org/binaries/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz -Source44: http://hg.services.openoffice.org/binaries/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz -Source45: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz -Source46: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -Source47: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Source48: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source49: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -Source50: http://hg.services.openoffice.org/binaries/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz -Source51: http://hg.services.openoffice.org/binaries/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz -Source52: http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -Source54: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip -Source55: http://download.go-oo.org/src/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz -#javaless -Source56: http://hg.services.openoffice.org/binaries/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz -Source57: http://dev-www.libreoffice.org/ooo_external/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz -Source58: http://hg.services.openoffice.org/binaries/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -Source59: http://hg.services.openoffice.org/binaries/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz -Source60: http://archive.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2 -Source61: http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source31: http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz Source100: libreoffice.rpmlintrc -Patch4: xulrunner-to-mozila-plugin.pc.diff -Patch5: mdv-sysui-disableslack.diff -Patch6: libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch -Patch9: vbahelper.visibility.patch -Patch10: disable-qtunixeventloop.patch -Patch11: poppler0.18.1.patch -Patch12: glib2.31.patch +BuildRequires: zip +BuildRequires: findutils +BuildRequires: autoconf +BuildRequires: flex +BuildRequires: bison +BuildRequires: icu +BuildRequires: gperf +BuildRequires: gcc-c++ +BuildRequires: binutils +BuildRequires: java-devel +BuildRequires: boost-devel +BuildRequires: zlib-devel +BuildRequires: python-devel +BuildRequires: expat-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel +BuildRequires: bc +BuildRequires: neon-devel +BuildRequires: libcurl-devel +BuildRequires: libidn-devel +BuildRequires: pam-devel +BuildRequires: cups-devel +BuildRequires: libxext-devel +BuildRequires: libxt-devel +BuildRequires: libice-devel +BuildRequires: libjpeg-devel +BuildRequires: make +BuildRequires: libwpd-devel >= 0.9.0 +BuildRequires: hunspell-devel +BuildRequires: unixODBC-devel +BuildRequires: db-devel +BuildRequires: sane-devel +BuildRequires: libicu-devel +BuildRequires: perl(Archive::Zip) +BuildRequires: freetype-devel +BuildRequires: gtk2-devel +BuildRequires: pkgconfig(ORBit-2.0) +BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 +BuildRequires: desktop-file-utils +BuildRequires: hyphen-devel +BuildRequires: evolution-data-server-devel +BuildRequires: xulrunner-devel +BuildRequires: libtextcat-devel +BuildRequires: nss-devel +BuildRequires: gstreamer0.10-devel +BuildRequires: libgstreamer0.10-plugins-base-devel +BuildRequires: openssl-devel +BuildRequires: mdds-devel +BuildRequires: lpsolve-devel +BuildRequires: bsh +BuildRequires: lucene >= 0:2.4.1 +BuildRequires: redland-devel +BuildRequires: ant +BuildRequires: ant-apache-regexp +BuildRequires: rsync +BuildRequires: apache-commons-codec +BuildRequires: jakarta-commons-httpclient +BuildRequires: cppunit-devel +BuildRequires: apache-commons-lang +BuildRequires: pkgconfig(poppler) +BuildRequires: pkgconfig(poppler-glib) +BuildRequires: pkgconfig(poppler-cpp) +BuildRequires: junit4 +BuildRequires: pentaho-reporting-flow-engine +BuildRequires: mythes-devel +BuildRequires: graphite2-devel +BuildRequires: lucene-contrib >= 0:2.4.1 +BuildRequires: libwpg-devel >= 1:0.2.0 +BuildRequires: libwps-devel >= 1:0.2.0 +BuildRequires: vigra-devel +BuildRequires: fontpackages-devel +BuildRequires: librsvg2-devel +BuildRequires: mysql-connector-c++-devel +BuildRequires: libGConf2-devel +BuildRequires: libORBit2-devel +BuildRequires: postgresql-devel +BuildRequires: libcmis-devel, libexttextcat-devel, libvisio-devel +# for the KDE subpackage +BuildRequires: kdelibs4-devel +BuildRequires: font(:lang=en) +BuildRequires: perl(Archive::Zip) +BuildRequires: perl(Digest::MD5) + +# Fedora patches +Patch1: openoffice.org-2.0.2.rh188467.printingdefaults.patch +Patch2: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch3: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch +Patch4: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch +Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch +Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch +Patch7: libreoffice-installfix.patch +Patch15: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch +Patch16: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch +Patch17: libreoffice-ensure-non-broken-xml-tree.patch +Patch18: 0001-preserve-timestamps-for-.py-files.patch +Patch19: 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch +Patch20: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch +Patch21: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch +Patch22: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +Patch23: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch +Patch24: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch +Patch25: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch +Patch26: 0001-fdo-38088-better-CSV-import-default-separators.patch +Patch27: 0001-save-register-arguments-first.patch +Patch28: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch +Patch29: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch +Patch30: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch +Patch31: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch +Patch32: 0001-use-ure-instead-of-ure-link.patch +Patch33: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch +Patch34: 0001-resolved-rhbz-838248-init-filter-criteria-string.patch + # bug fix 64789 -Patch13: help-images-mdv64789.patch -# bug fix 64945 (experimental) -Patch14: libreoffice34-gcc462.patch +Patch100: help-images-mdv64789.patch + +# libreoffice metapackage requires all of the programs +Requires: %{name}-base = %{version} +Requires: %{name}-calc = %{version} +Requires: %{name}-draw = %{version} +Requires: %{name}-impress = %{version} +Requires: %{name}-math = %{version} +Suggests: %{name}-pdfimport +Requires: %{name}-writer = %{version} +Obsoletes: openoffice.org < 1:3.3.1 +Provides: openoffice.org = 1:%{version}-%{release} + +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%define instdir %{_libdir} +%define baseinstdir %{instdir}/libreoffice +%define ureinstdir %{baseinstdir}/ure +%define sdkinstdir %{baseinstdir}/sdk +%define fontname opensymbol %description -LibreOffice is an Open Source, community-developed, multi-platform -office productivity suite. It includes the key desktop applications, -such as a word processor, spreadsheet, presentation manager, formula -editing and drawing program, with a user interface and feature set -similar to other office suites. Sophisticated and flexible, -LibreOffice also works transparently with a variety of file -formats, including Microsoft Office. +LibreOffice is an Open Source, community-developed, office productivity suite. +It includes the key desktop applications, such as a word processor, +spreadsheet, presentation manager, formula editor and drawing program, with a +user interface and feature set similar to other office suites. Sophisticated +and flexible, LibreOffice also works transparently with a variety of file +formats, including Microsoft Office File Formats. -%package base -Group: Office -Summary: LibreOffice office suite - database -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -# Heavy java deps -%if !%javaless -Requires: hsqldb -%endif -Suggests: %{name}-java-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-base < 1:3.3-1:2011.0 -# Provides: openoffice.org-base = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-base <= 1:3.1-4 -%endif - -%description base -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the database component for LibreOffice. - -You can extend the functionality of LibreOffice Base by installing these -packages: - - * unixodbc: ODBC database support - * libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools: ODBC - drivers for: - - MySQL - - PostgreSQL - - SQLite - - MS SQL / Sybase SQL - - *.mdb (JET / MS Access) - * libmysql-java | libpg-java | libsapdbc-java: JDBC Drivers - for: - - MySQL - - PostgreSQL - - MaxDB - -%package calc -Group: Office -Summary: LibreOffice office suite - spreadsheet -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-calc < 1:3.3-1:2011.0 -# Provides: openoffice.org-calc = 1:3.3-1:2011.0 -# Provides: openoffice.org-calc = %{EVRD} -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-calc <= 1:3.1-4 -%endif - -%description calc -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the spreadsheet component for LibreOffice. - -%package common -Group: Office -Summary: LibreOffice office suite architecture independent files -%if %mdkversion < 200810 -# On upgrades, we can't split that way or we will loose functionality. -# Requires: %{name}-gnome -# Requires: %{name}-kde -Requires: %{name}-openclipart -Requires: %{name}-style-galaxy -Requires: %{name}-style-crystal -Requires: %{name}-style-hicontrast -Requires: %{name}-style-tango -%endif -# Require the architecture dependant stuff -Requires: %{name}-core = %{EVRD} -# Require at least one style to be installed -Requires: %{name}-style = %{EVRD} -# And suggest the galaxy one -# dev 300 -# Suggests: %{name}-style-galaxy = %{version} -# Also suggest java-common, as it may be used by some macros -Suggests: %{name}-java-common = %{EVRD} -Suggests: %{name}-help-en_US = %{EVRD} -# And then general requires for OOo follows -Requires: ghostscript -Requires: fonts-ttf-liberation -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 -# Requires: paper-utils -Requires(post): desktop-file-utils update-alternatives -Requires(postun): desktop-file-utils update-alternatives - -# Due to the split -Conflicts: openoffice.org <= 2.1.0 -Conflicts: openoffice.org-devel <= 2.3.0.5-1mdv -Conflicts: openoffice.org-math <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.99.4-1mdv -Conflicts: openoffice.org-gnome < 3.0svn13581-2mdv -Obsoletes: openoffice.org-common < 1:3.3-1:2011.0 -# Provides: openoffice.org-common = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.1.0 -Conflicts: openoffice.org64-devel <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-math <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-core <= 2.3.99.4-1mdv -Conflicts: openoffice.org64-gnome < 3.0svn13581-2mdv -Obsoletes: openoffice.org64-common <= 1:3.1-4 -%endif -Conflicts: %{name}-common = 1:3.2-rc4.0 - -# Upstream dropped this packages in 3.4 -Obsoletes: %{name}-l10n-pt_AO = 1:3.3.2-1 -Obsoletes: %{name}-help-pt_AO = 1:3.3.2-1 -Obsoletes: %{name}-help-ta = 1:3.3.2-1 -Obsoletes: %{name}-help-zu = 1:3.3.2-1 -Obsoletes: %{name}-help-cy = 1:3.3.2-1 -Obsoletes: %{name}-help-ar = 1:3.3.2-1 -Obsoletes: %{name}-help-af = 1:3.3.2-1 -Obsoletes: %{name}-help-br = 1:3.3.2-1 - -%description common -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the architecture-independent files of LibreOffice. %package core +Summary: Core modules for LibreOffice Group: Office -Summary: LibreOffice office suite architecture dependent files -# Due to the split -Conflicts: openoffice.org <= 2.1.0 -Conflicts: openoffice.org-base <= 2.3.0.5-1mdv -Conflicts: openoffice.org-common <= 2.3.1-1mdv -Conflicts: openoffice.org-devel <= 2.3.0.5-1mdv -Conflicts: openoffice.org-draw <= 2.3.0.5-1mdv -Conflicts: openoffice.org-impress <= 2.3.0.5-1mdv -Conflicts: openoffice.org-kde <= 2.3.0.5-1mdv -Conflicts: openoffice.org-writer <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-core < 1:3.3-1:2011.0 -# Provides: openoffice.org-core = 1:3.3-1:2011.0 -# Provides: openoffice.org-core = %{EVRD} -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.1.0 -Conflicts: openoffice.org64-base <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-common <= 2.3.1-1mdv -Conflicts: openoffice.org64-devel <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-draw <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-impress <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-writer <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-core <= 1:3.1-4 -%endif +Requires: %{name}-%{fontname}-fonts = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Requires: fonts-ttf-liberation +Requires: fonts-ttf-dejavu +Requires: hunspell +Requires: hyphen >= 2.4 +Suggests: hyphen-en +Suggests: autocorr-en +Suggests: hunspell-en +Requires: lucene >= 0:2.4.1 +Requires: lucene-contrib +Requires: libexttextcat +Requires: %name-langpack = %version-%release +Requires(pre): gtk2 >= 2.9.4 +Requires(post): gtk2 >= 2.9.4 +Requires(preun): gtk2 >= 2.9.4 +Requires(postun): gtk2 >= 2.9.4 +Obsoletes: openoffice.org-core < 1:3.3.1 +Provides: openoffice.org-core = 1:%version-%release +Obsoletes: openoffice.org-common < 1:3.3.1 +Provides: openoffice.org-common = 1:%version-%release +Obsoletes: openoffice.org-brand < 1:3.3.1, broffice.org-brand < 1:3.3.1 +Obsoletes: openoffice.org-filter-binfilter < 1:3.3.1 +Provides: openoffice.org-filter-binfilter = 1:%version-%release +Obsoletes: openoffice.org-help-en_US < 1:3.3.1 +Provides: openoffice.org-help-en_US = 1:%version-%release +Obsoletes: openoffice.org-help-en_GB < 1:3.3.1 +Provides: openoffice.org-help-en_GB = 1:%version-%release +Obsoletes: openoffice.org-langpack-ms < 1:3.3.1 +Obsoletes: libreoffice-langpack-ms < 1:3.3.99.1 +Obsoletes: openoffice.org-langpack-ur < 1:3.3.1 +Obsoletes: libreoffice-langpack-ur < 1:3.3.99.1 +Provides: libreoffice-style-tango = %{version}-%{release} +Provides: libreoffice-style-oxygen = %{version}-%{release} +Conflicts: %name-ure < 3.3.2.2-7 +Obsoletes: openoffice.org-testtools < 1:3.3.1 +Obsoletes: libreoffice-testtools < 3.4.99.1 %description core -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. +The shared core libraries and support files for LibreOffice. -This package contains the architecture-dependent core files of LibreOffice. -See the libreoffice package for more information. -%package devel +%package pyuno +Summary: Python support for LibreOffice +Group: Development/Other +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Requires: python +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-pyuno < 1:3.3.1 +Provides: openoffice.org-pyuno = 1:%version-%release + +%description pyuno +Python bindings for the LibreOffice UNO component model. Allows scripts both +external to LibreOffice and within the internal LibreOffice scripting framework +to be written in python. + + +%package base +Summary: Database front-end for LibreOffice Group: Office -Summary: LibreOffice SDK - development files -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Obsoletes: openoffice.org-devel < 1:3.3-1:2011.0 +Requires: postgresql-jdbc +Requires: %{name}-ure = %{version}-%{release} +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-calc = %{version}-%{release} +Requires: hsqldb +Suggests: %{name}-java-common = %{version}-%release +Obsoletes: openoffice.org-base < 1:3.3.1, broffice.org-base < 1:3.3.1 +Provides: openoffice.org-base = 1:%version-%release +Obsoletes: openoffice.org-style < 1:3.3.1 +Provides: openoffice.org-style = 1:%version-%release +Obsoletes: openoffice.org-style-crystal < 1:3.3.1 +Provides: openoffice.org-style-crystal = 1:%version-%release +Obsoletes: openoffice.org-style-oxygen < 1:3.3.1 +Provides: openoffice.org-style-oxygen = 1:%version-%release -%description devel -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. +%description base +GUI database front-end for LibreOffice. Allows creation and management of +databases through a GUI. -This package contains the files needed to build plugins/add-ons for -LibreOffice (includes, IDL files, build tools, ...). It also contains the -zipped source of the UNO Java libraries for use in IDEs like eclipse. -%package devel-doc +%package report-builder +Summary: Create database reports from LibreOffice Group: Office -Summary: LibreOffice SDK - documentation -Requires: %{name}-devel = %{version} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-devel-doc < 1:3.3-1:2011.0 +Requires: pentaho-reporting-flow-engine +Requires: %{name}-base = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-report-builder < 1:3.3.1 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-devel-doc <= 1:3.1-4 -%endif +%description report-builder +Creates database reports from LibreOffice databases. The report builder can +define group and page headers as well as group, page footers and calculation +fields to accomplish complex database reports. -%description devel-doc -LibreOffice is a full-featured office productivity suite that provides -a near drop-in replacement for Microsoft(R) Office. -This package contains the documentation of the LibreOffice SDK: +%package bsh +Summary: BeanShell support for LibreOffice +Group: Development/Other +Requires: bsh +Requires: %{name}-core = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-bsh < 1:3.3.1 +Provides: openoffice.org-bsh < 1:%version-%release - * C++/Java API reference - * IDL reference - * C++/Java/Basic examples +%description bsh +Support BeanShell scripts in LibreOffice. + + +%package rhino +Summary: JavaScript support for LibreOffice +Group: Development/Other +Requires: %{name}-core = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-rhino < 1:3.3.1 + + +%description rhino +Support JavaScript scripts in LibreOffice. + + +%package wiki-publisher +Summary: Create Wiki articles on MediaWiki servers with LibreOffice +Group: Office +Requires: apache-commons-codec, jakarta-commons-httpclient +Requires: apache-commons-lang, apache-commons-logging +Requires: %{name}-writer = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-wiki-publisher < 1:3.3.1 + +%description wiki-publisher +The Wiki Publisher enables you to create Wiki articles on MediaWiki servers +without having to know the syntax of the MediaWiki markup language. Publish +your new and existing documents transparently with writer to a wiki page. + +%package nlpsolver +Summary: Non-linear solver engine for LibreOffice Calc +Group: Office +Requires: %{name}-calc = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core + +%description nlpsolver +A non-linear solver engine for Calc as an alternative to the default linear +programming model when more complex, nonlinear programming is required. + +%package ogltrans +Summary: 3D OpenGL slide transitions for LibreOffice +Group: Office +Requires: %{name}-impress = %{version}-%{release} +Requires(pre): %{name}-core +Obsoletes: openoffice.org-ogltrans < 1:3.3.1 + +%description ogltrans +OpenGL Transitions enable 3D slide transitions to be used in LibreOffice. +Requires good quality 3D support for your graphics card for best experience. + + +%package presentation-minimizer +Summary: Shrink LibreOffice presentations +Group: Office +Requires: %{name}-impress = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-presentation-minimizer < 1:3.3.1 + +%description presentation-minimizer +The Presentation Minimizer is used to reduce the file size of the current +presentation. Images will be compressed, and data that is no longer needed will +be removed. + + +%package presenter-screen +Summary: Presenter Screen for LibreOffice Presentations +Group: Office +Requires: %{name}-impress = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-presenter-screen < 1:3.3.1 + +%description presenter-screen +The Presenter Screen is used to provides information on a second screen, that +typically is not visible to the audience when delivering a presentation. e.g. +slide notes. + + +%package pdfimport +Summary: PDF Importer for LibreOffice Draw +Group: Office +Requires: %{name}-draw = %{version}-%{release} +Requires(pre): %{name}-core +Requires(post): %{name}-core +Requires(preun): %{name}-core +Requires(postun): %{name}-core +Obsoletes: openoffice.org-pdfimport < 1:3.3.1 + +%description pdfimport +The PDF Importer imports PDF into drawing documents to preserve layout +and enable basic editing of PDF documents. + + +%package %{fontname}-fonts +Summary: LibreOffice dingbats font +Group: System/Fonts/True type +Requires: fontpackages-filesystem +Obsoletes: openoffice.org-fonts < 1:3.3.1 +Obsoletes: openoffice.org-opensymbol-fonts < 1:3.3.1 +BuildArch: noarch + +%description %{fontname}-fonts +A dingbats font, OpenSymbol, suitable for use by LibreOffice for bullets and +mathematical symbols. + + +%package writer +Summary: LibreOffice Word Processor Application +Group: Office +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Obsoletes: openoffice.org-writer-core < 1:3.3.1 +Obsoletes: openoffice.org-writer < 1:3.3.1, broffice.org-writer < 1:3.3.1 +Provides: openoffice.org-writer = 1:%{version}-%{release} +Obsoletes: openoffice.org-writer2latex < 1:3.3.1 +Provides: openoffice.org-writer2latex = 1:%{version}-%{release} +Obsoletes: openoffice.org-writer2xhtml < 1:3.3.1 +Provides: openoffice.org-writer2xhtml = 1:%{version}-%{release} + +%description writer +The LibreOffice Word Processor application. + + +%package emailmerge +Summary: Email mail-merge component for LibreOffice +Group: Office +Requires: %{name}-writer = %{version}-%{release} +Requires: %{name}-pyuno = %{version}-%{release} +Obsoletes: openoffice.org-emailmerge < 1:3.3.1 + +%description emailmerge +Enables the LibreOffice writer module to mail-merge to email. + + +%package calc +Summary: LibreOffice Spreadsheet Application +Group: Office +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Obsoletes: openoffice.org-calc-core < 1:3.3.1 +Obsoletes: openoffice.org-calc < 1:3.3.1, broffice.org-calc < 1:3.3.1 + +%description calc +The LibreOffice Spreadsheet application. -It also contains the gsicheck utility. %package draw +Summary: LibreOffice Drawing Application Group: Office -Summary: LibreOffice office suite - drawing -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-impress <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-draw < 1:3.3-1:2011.0 -# Provides: openoffice.org-draw = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-impress <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-draw <= 1:3.1-4 -%endif +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Requires: %{name}-pdfimport = %{version}-%{release} +Requires: %{name}-graphicfilter = %{version}-%{release} +Obsoletes: openoffice.org-draw-core < 1:3.3.1 +Obsoletes: openoffice.org-draw < 1:3.3.1, broffice.org-draw < 1:3.3.1 +provides: openoffice.org-draw = 1:%{version}-%{release} %description draw -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the drawing component for LibreOffice. - -# package dtd-officedocument1.0 -# Group: Office -# Summary: OfficeDocument 1.0 DTD (OpenOffice.org 1.x) -## due to the split -#Conflicts: %{name} <= 2.2.1 -## no need to require -core or -common, see #37559 - -#%description dtd-officedocument1.0 -#LibreOffice is a full-featured office productivity suite that provides a -#near drop-in replacement for Microsoft(R) Office. - -# This package contains the Document Type Definition (DTD) of the OpenOffice.org -# 1.x(!) XML file format. - -%package filter-binfilter -Group: Office -Summary: Legacy filters (e.g. StarOffice 5.2) for LibreOffice -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-filter-mobiledev <= 2.3.0.5 -Conflicts: openoffice.org-filter-mobiledev <= 2.3.0.5 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-filter-binfilter < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-filter-mobiledev <= 2.3.0.5 -Obsoletes: openoffice.org64-filter-binfilter <= 1:3.1-4 -%endif - - -%description filter-binfilter -LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - -This package contains the "binfilters", legacy filters for - - the old StarOffice 5.2 formats - - StarWriter 1.0/2.0 - - StarWriter/DOS - - *Writer* filters for - + Excel - + Lotus - -%package gnome -Group: Office -Summary: GNOME Integration for LibreOffice (VFS, GConf) -Requires: %{name}-common = %{EVRD} -Requires: %{name}-core = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-gtk <= 2.3.0.5 -Conflicts: openoffice.org-gtk <= 2.3.0.5 -Obsoletes: openoffice.org-qstart <= 2.3.0.5 -Conflicts: openoffice.org-qstart <= 2.3.0.5 -Obsoletes: openoffice.org-evolution <= 2.3.0.5 -Conflicts: openoffice.org-evolution <= 2.3.0.5 -# Suggests: %{name}-style-tango = %{version} -Obsoletes: openoffice.org-gnome < 1:3.3-1:2011.0 -# Provides: openoffice.org-gnome = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-gtk <= 2.3.0.5 -Obsoletes: openoffice.org64-qstart <= 2.3.0.5 -Obsoletes: openoffice.org64-evolution <= 2.3.0.5 -Obsoletes: openoffice.org64-gnome <= 1:3.1-4 -%endif - -%description gnome -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the GNOME VFS support and a GConf backend. +The LibreOffice Drawing Application. %package impress +Summary: LibreOffice Presentation Application Group: Office -Summary: LibreOffice office suite - presentation -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Requires: %{name}-draw = %{EVRD} -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-impress < 1:3.3-1:2011.0 -# Provides: openoffice.org-impress = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-impress <= 1:3.1-4 -%endif +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Requires: %{name}-ogltrans = %{version}-%{release} +Requires: %{name}-presenter-screen = %{version}-%{release} +Obsoletes: openoffice.org-impress-core < 1:3.3.1 +Obsoletes: openoffice.org-impress < 1:3.3.1, broffice.org-impress < 1:3.3.1 +Provides: openoffice.org-impress = 1:%{version}-%{release} %description impress -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. +The LibreOffice Presentation Application. -This package contains the presentation component for LibreOffice. -%package kde4 +%package math +Summary: LibreOffice Equation Editor Application Group: Office -Summary: KDE4 Integration for LibreOffice (Widgets, Dialogs, Addressbook) -Requires: %{name}-common = %{EVRD} -Requires: %{name}-core = %{EVRD} -Suggests: %{name}-style-oxygen = %{EVRD} -Obsoletes: openoffice.org-kde4 < 1:3.3-1:2011.0 -# Provides: openoffice.org-kde4 = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-kde <= 1:3.1-4 -%endif -Conflicts: openoffice.org-core <= %{version}-beta1.0mdv +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-ure = %{version}-%{release} +Obsoletes: openoffice.org-math-core < 1:3.3.1 +Obsoletes: openoffice.org-math < 1:3.3.1, broffice.org-math < 1:3.3.1 + +%description math +The LibreOffice Equation Editor Application. + + +%package graphicfilter +Summary: LibreOffice Extra Graphic filters +Group: Office +Requires: %{name}-ure = %{version}-%{release} +Requires: %{name}-core = %{version}-%{release} +Obsoletes: openoffice.org-graphicfilter < 1:3.3.1 + +%description graphicfilter +The graphicfilter module for LibreOffice provides graphic filters, e.g. svg and +flash filters. + + +%package xsltfilter +Summary: Optional xsltfilter module for LibreOffice +Group: Office +Requires: %{name}-core = %{version}-%{release} +Obsoletes: openoffice.org-xsltfilter < 1:3.3.1 + +%description xsltfilter +The xsltfilter module for LibreOffice, provides additional docbook and +xhtml export transforms. Install this to enable docbook export. + + +%package javafilter +Summary: Optional javafilter module for LibreOffice +Group: Office +Requires: %{name}-core = %{version}-%{release} +Obsoletes: openoffice.org-javafilter < 1:3.3.1 + +%description javafilter +The javafilter module for LibreOffice, provides additional AportisDoc, +Pocket Excel and Pocket Word import filters. + +%package postgresql +Summary: PostgreSQL connector for LibreOffice +Group: Office +Requires: %{name}-base = %{version}-%{release} +Requires: postgresql-libs + +%description postgresql +A PostgreSQL connector for the database front-end for LibreOffice. Allows +creation and management of PostgreSQL databases through a GUI. + + +%package ure +Summary: UNO Runtime Environment +Group: Development/Other +Requires: unzip +Suggests: %name-java-common = %version-%release +Obsoletes: openoffice.org-ure < 1:3.3.1 +Conflicts: libreoffice-core <= 3.3.2.2-5 + +%description ure +UNO is the component model of LibreOffice. UNO offers interoperability between +programming languages, other components models and hardware architectures, +either in process or over process boundaries, in the Intranet as well as in the +Internet. UNO components may be implemented in and accessed from any +programming language for which a UNO implementation (AKA language binding) and +an appropriate bridge or adapter exists -%description kde4 -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. -This package contains the KDE4 plugin for drawing LibreOffice widgets with -KDE4/Qt4.x and a KDEish File Picker when running under KDE4. - %package java-common Group: Office Summary: LibreOffice office suite Java support arch. independent files -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Requires: java -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-java-common < 1:3.3-1:2011.0 -#Provides: openoffice.org-java-common = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-java-common <= 1:3.1-4 -%endif +Requires: %{name}-core = %{version}-%{release} +#Requires: %{name}-common = %{version}-%{release} +Requires: jre +Conflicts: %name-core < 3.3.2.2-8 +Obsoletes: openoffice.org-java-common < 1:3.3.1 +Provides: openoffice.org-java-common = 1:%version-%release %description java-common LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. This package contains the architecture-independent files of the Java support -for LibreOffice (Java classes, scripts, config snippets). +for Libreoffice (Java classes, scripts, config snippets). -Also contains the LibreOffice Office Bean for embedding LibreOffice in +Also contains the Libreoffice Office Bean for embedding Libreoffice in custom Java applications. -%package math -Group: Office -Summary: LibreOffice office suite - equation editor -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-math < 1:3.3-1:2011.0 -#Provides: openoffice.org-math = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-math <= 1:3.1-4 + +%package sdk +Summary: Software Development Kit for LibreOffice +Group: Development/Other +Requires: %{name}-ure = %{version}-%{release} +Requires: %{name}-core = %{version}-%{release} +Requires: unzip, java-devel +Obsoletes: openoffice.org-sdk < 1:3.3.1, openoffice.org-devel < 1:3.3.1 + +%description sdk +The LibreOffice SDK is an add-on for the LibreOffice office suite. It provides +the necessary tools for programming using the LibreOffice APIs and for creating +extensions (UNO components) for LibreOffice. To set the build environment for +building against the sdk use %{sdkinstdir}/setsdkenv_unix.sh. + + +%package sdk-doc +Summary: Software Development Kit documentation for LibreOffice +Group: Development/Other +Requires: %{name}-sdk = %{version}-%{release} +Obsoletes: openoffice.org-sdk-doc < 1:3.3.1 + +%description sdk-doc +This provides documentation for programming using the LibreOffice APIs +and examples of creating extensions (UNO components) for LibreOffice. + + +%package headless +Summary: LibreOffice Headless plug-in +Group: Development/Other +Requires: %{name}-ure = %{version}-%{release} +Requires: %{name}-core = %{version}-%{release} +Obsoletes: openoffice.org-headless < 1:3.3.1 + +%description headless +A plug-in for LibreOffice that enables it to function without an X server. +It implements the -headless command line option and allows LibreOffice to be +used as a backend server for e.g. document conversion. + + +%package kde +Summary: LibreOffice KDE integration plug-in +Group: Office +Requires: %{name}-core = %{version}-%{release} +Obsoletes: openoffice.org-kde4 < 1:3.3.1 +Provides: openoffice.org-kde4 = 1:%version-%release + +%description kde +A plug-in for LibreOffice that enables integration into the KDE desktop environment. + +%if %{with binfilter} +%package binfilter +Summary: Legacy binary filters for LibreOffice +Group: Office +Requires: %{name}-core = %{version}-%{release} + +%description binfilter +Filters for old StarOffice binary formats. %endif -%description math -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. +%if 0%{?_enable_debug_packages} -This package contains the equation editor component for LibreOffice. +%define debug_package %{nil} +%global __debug_package 1 + +%package debug +Summary: Debug information for package %{name} +Group: Development/Debug +AutoReqProv: 0 +Requires: libreoffice-core = %{version}-%{release} +Requires: libreoffice-gdb-debug-support = %{version}-%{release} + +%description debug +This package provides debug information for package %{name}. +Debug information is useful when developing applications that use this +package or when debugging this package. + + +%files debug -f debugfiles.list + +%package gdb-debug-support +Summary: Additional support for debugging with gdb +Group: Development/Other +Requires: gdb +AutoReqProv: 0 + +%description gdb-debug-support +This package provides gdb pretty printers for package %{name}. + + +%files gdb-debug-support +# TODO does it make sense to install this? +%{baseinstdir}/program/gdbtrace +%{_datadir}/gdb/auto-load%{baseinstdir} +%{_datadir}/libreoffice/gdb -%package openclipart -Group: Office -Summary: LibreOffice Open Clipart data -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-galleries <= 2.2.1 -Obsoletes: openoffice.org-openclipart < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-galleries <= 2.2.1 -Obsoletes: openoffice.org64-openclipart <= 1:3.1-4 %endif -%description openclipart -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the LibreOffice Open Clipart data, including images -and sounds. - -%package pyuno -Group: Office -Summary: Python bindings for UNO library -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-pyuno < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-pyuno <= 1:3.1-4 -%endif - -%description pyuno -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the Python bindings for the UNO library. - -#%package qa-api-tests -#Group: Office -#Summary: LibreOffice API Test Data -#Requires: %{name}-common = %{version}-%{release} -## Due to the split -#Conflicts: %{name} <= 2.2.1 +# Defines a language pack subpackage. # -#%description qa-api-tests -#LibreOffice is a full-featured office productivity suite that provides a -#near drop-in replacement for Microsoft(R) Office. +# It's necessary to define language code (-l) and language name (-n). +# Additionally, it's possible +# * to require autocorr, hunspell, hyphen or mythes package or font for +# given language, +# * to obsolete openoffice.org-langpack package, +# * to provide libreoffice-langpack-loc package, where loc is glibc +# locale--this is necessary for urpmi to pick it automatically, +# * to require other, unrelated, packages, +# * to specify file serving as file list. +# For these, lower case character argument takes an argument specifying +# language, upper case character argument uses language from -l. # -#This package contains the test data for the OpenOffice.org Java and Basic APIs. - -%package testtool -Group: Office -Summary: LibreOffice Automatic Test Programs -Requires: %{name}-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-testtool < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-testtool <= 1:3.1-4 -%endif - -%description testtool -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the test tools to automatically test the LibreOffice -programs. - -%package style-galaxy -Group: Office -Summary: Default symbol style for LibreOffice -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-style-andromeda <= %{version} -Obsoletes: openoffice.org-style-galaxy < 1:3.3-1:2011.0 -#Provides: openoffice.org-style-galaxy = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-style-galaxy <= 1:3.1-4 -%endif - -%description style-galaxy -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the "Galaxy" symbol style from Sun, normally used on -MS Windows (tm) and when not using GNOME or KDE. Needs to be manually enabled -in the LibreOffice option menu. - -%package style-crystal -Group: Office -Summary: Crystal symbol style for LibreOffice -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-style-crystal < 1:3.3-1:2011.0 -#Provides: openoffice.org-style-crystal = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-style-crystal <= 1:3.1-4 -%endif - -%description style-crystal -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the "crystal" symbol style, default style for KDE. - -%package style-hicontrast -Group: Office -Summary: Hicontrast symbol style for LibreOffice -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-style-hicontrast < 1:3.3-1:2011.0 -#Provides: openoffice.org-style-hicontrast = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-style-hicontrast <= 1:3.1-4 -%endif - -%description style-hicontrast -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the "hicontrast" symbol style, needs to be manually -enabled in the LibreOffice option menu. - -%package style-tango -Group: Office -Summary: Tango symbol style for LibreOffice -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Obsoletes: openoffice.org-style-tango < 1:3.3-1:2011.0 -# Provides: openoffice.org-style-tango = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Obsoletes: openoffice.org64-style-tango <= 1:3.1-4 -%endif - -%description style-tango -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the "tango" symbol style, default style for GTK/Gnome. - -%package style-oxygen -Group: Office -Summary: Oxygen symbol style for LibreOffice -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -# Due to the split -Conflicts: openoffice.org = 2.2.1 -Obsoletes: openoffice.org-style-oxygen < 1:3.3-1:2011.0 -#Provides: openoffice.org-style-oxygen = 1:3.3-1:2011.0 - -%description style-oxygen -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the "oxygen" symbol style, default style for KDE4. - -%package writer -Group: Office -Summary: LibreOffice office suite - word processor -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-writer < 1:3.3-1:2011.0 -#Provides: openoffice.org-writer = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-writer <= 1:3.1-4 -%endif - -%description writer -LibreOffice is a full-featured office productivity suite that provides a -near drop-in replacement for Microsoft(R) Office. - -This package contains the wordprocessor component for LibreOffice. - -%package mono -Summary: Mono UNO Bridge for LibreOffice -Group: Office -Requires: %{ooname} = %{version} -Obsoletes: openoffice.org-go-ooo-mono <= %{version} -Obsoletes: openoffice.org-mono < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-mono <= 1:3.1-4 -%endif - -%description mono -The Mono/UNO binding allows a Mono application to access the complete -set of APIs exposed by LibreOffice via UNO. - -Currently the use of Mono for add-ins & scripting inside LibreOffice itself is -not supported. - -%package pdfimport -Group: Office -Summary: LibreOffice office suite - PDF Import extension -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Requires: %{name}-draw = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-pdfimport < 1:3.3-1:2011.0 -#Provides: openoffice.org-pdfimport = 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-pdfimport <= 1:3.1-4 -%endif -Conflicts: openoffice.org-pdfimport <= 1:3.2-rc4.0 - -%description pdfimport -PDF import extension enables PDF documments importing and basic editing of PDF -documments by using LibreOffice-draw application. - -%package presenter-screen -Group: Office -Summary: LibreOffice office suite - Presenter Screen extension -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Requires: %{name}-impress = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-presenter-screen < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-presenter-screen <= 1:3.1-4 -%endif -Conflicts: %{name}-presenter-screen <= 1:3.2-rc4.0 - -%description presenter-screen -Presenter Screen extension helps users to see upcoming slides and slide notes -of presentations inside a second view not visible for the spectators. - -# %package report-builder -# Group: Office -# Summary: LibreOffice office suite - Report Builder extension -# Requires: %{name}-core = %{version}-%{release} -# Requires: %{name}-common = %{version}-%{release} -# Requires: %{name}-base = %{version} -# Due to the split -# Conflicts: %{name} <= 2.2.1 -# Conflicts: %{name}-common <= 2.3.0.5-1mdv -# Conflicts: %{name}-core <= 2.3.0.5-1mdv -# %ifarch x86_64 -# Conflicts: %{name}64 <= 2.2.1 -# Conflicts: %{name}64-common <= 2.3.0.5-1mdv -# Conflicts: %{name}64-core <= 2.3.0.5-1mdv -# Obsoletes: openoffice.org64-report-builder < 1:3.1-4 -# %endif - -# %description report-builder -# By using %{name}-base the Report Builder extesion enables creating of smart and -# professional looking reports. Further the reports can be exported to PDF or -# OpenDocuments formats. - -%package wiki-publisher -Group: Office -Summary: LibreOffice office suite - Wiki Publisher extension -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Requires: %{name}-writer = %{EVRD} -%if !%javaless -Requires: jakarta-commons-codec, jakarta-commons-httpclient -Requires: jakarta-commons-lang, jakarta-commons-logging -%endif -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-wiki-publisher < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-wiki-publisher <= 1:3.1-4 -%endif -Conflicts: openoffice.org-wiki-publisher <= 1:3.2-rc4.0 - -%description wiki-publisher -With Wiki Publisher extesion is possible by using %{name}-writer to create -wiki page articles on MediaWiki servers without having to know the syntax of -MediaWiki markup language. This extension also enables publishing of the -wiki pages. - -%package presentation-minimizer -Group: Office -Summary: LibreOffice office suite - Presentation Minimizer extension -Requires: %{name}-core = %{EVRD} -Requires: %{name}-common = %{EVRD} -Requires: %{name}-impress = %{EVRD} -# Due to the split -Conflicts: openoffice.org <= 2.2.1 -Conflicts: openoffice.org-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org-presentation-minimizer < 1:3.3-1:2011.0 -%ifarch x86_64 -Conflicts: openoffice.org64 <= 2.2.1 -Conflicts: openoffice.org64-common <= 2.3.0.5-1mdv -Conflicts: openoffice.org64-core <= 2.3.0.5-1mdv -Obsoletes: openoffice.org64-presentation-minimizer <= 1:3.1-4 -%endif -Conflicts: openoffice.org-presentation-minimizer <= 1:3.2-rc4.0 - -%description presentation-minimizer -With Presentation Minimizer extesion is possible to reduce the file size of the -presentation by compressing images and removing data not needed in a automatizated -way. - -Note: The Presentation Minimizer also works on Microsoft PowerPoint presentations. - -%if %l10n - -%package l10n-af -Summary: Afrikaans language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-af -Requires: urw-fonts -Requires: myspell-af -Provides: LibreOffice-l10n-af -Obsoletes: openoffice.org-go-ooo-l10n-af <= %{version} -Obsoletes: openoffice.org-l10n-af < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-af <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-af <= 3.1-4 -%endif - -%description l10n-af -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Afrikaans. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ar -Summary: Arabic language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ar -Requires: fonts-ttf-arabic -Provides: LibreOffice-l10n-ar -Obsoletes: openoffice.org-go-ooo-l10n-ar <= %{version} -Obsoletes: openoffice.org-l10n-ar < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-ar <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-ar <= 3.1-4 -%endif - -%description l10n-ar -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Arabic. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - -%package l10n-as -Summary: Assamese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-as -Provides: LibreOffice-l10n-as - -%description l10n-as -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Assamese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-bg -Summary: Bulgarian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-bg -Provides: LibreOffice-l10n-bg -Obsoletes: openoffice.org-go-ooo-l10n-bg <= %{version} -Suggests: %{ooname}-help-bg = %{EVRD} -Obsoletes: openoffice.org-l10n-bg < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-bg <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-bg <= 3.1-4 -%endif - -%description l10n-bg -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Bulgarian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-bn -Summary: Bengali language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-bn -Provides: LibreOffice-l10n-bn -Suggests: %{ooname}-help-bn = %{EVRD} - -%description l10n-bn -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Bengali. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-br -Summary: Breton language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-br -Provides: LibreOffice-l10n-br -Obsoletes: openoffice.org-go-ooo-l10n-br <= %{version} -Obsoletes: openoffice.org-l10n-br < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-br <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-br <= 3.1-4 -%endif - -%description l10n-br -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Breton. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-bs -Summary: Bosnian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-bs -Provides: LibreOffice-l10n-bs -Obsoletes: openoffice.org-go-ooo-l10n-bs <= %{version} -Suggests: %{ooname}-help-bs = %{EVRD} -Obsoletes: openoffice.org-l10n-bs < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-bs <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-bs <= 3.1-4 -%endif - -%description l10n-bs -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Bosnian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ca -Summary: Catalan language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ca -Requires: urw-fonts -Requires: myspell-ca -Provides: LibreOffice-l10n-ca -Obsoletes: openoffice.org-go-ooo-l10n-ca <= %{version} -Suggests: %{ooname}-help-ca = %{EVRD} -Obsoletes: openoffice.org-l10n-ca < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-ca <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-ca <= 3.1-4 -%endif - -%description l10n-ca -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Catalan. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-cs -Summary: Czech language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-cs -Requires: urw-fonts -Requires: myspell-cs -Requires: myspell-hyph-cs -Provides: LibreOffice-l10n-cs -Obsoletes: openoffice.org-go-ooo-l10n-cs <= %{version} -Suggests: %{ooname}-help-cs = %{EVRD} -Obsoletes: openoffice.org-l10n-cs < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-cs <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-cs <= 3.1-4 -%endif - -%description l10n-cs -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Czech. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-cy -Summary: Welsh language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-cy -Requires: urw-fonts -Requires: myspell-cy -Provides: LibreOffice-l10n-cy -Obsoletes: openoffice.org-go-ooo-l10n-cy <= %{version} -Obsoletes: openoffice.org-l10n-cy < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-cy <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-cy <= 3.1-4 -%endif - -%description l10n-cy -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Welsh. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-da -Summary: Danish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-da -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-da, myspell-hyph-da -Provides: LibreOffice-l10n-da -Obsoletes: openoffice.org-go-ooo-l10n-da <= %{version} -Suggests: %{ooname}-help-da = %{EVRD} -Obsoletes: openoffice.org-l10n-da < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-da <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-da <= 3.1-4 -%endif - -%description l10n-da -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Danish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-de -Summary: German language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-de -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-de -Requires: myspell-hyph-de -Provides: LibreOffice-l10n-de -Obsoletes: openoffice.org-go-ooo-l10n-de <= %{version} -Suggests: %{ooname}-help-de = %{EVRD} -Obsoletes: openoffice.org-l10n-de < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-de <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-de <= 3.1-4 -%endif - -%description l10n-de -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in German. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - -%package l10n-dz -Summary: Dzongkha language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-dz -Provides: LibreOffice-l10n-dz -Suggests: %{ooname}-help-dz = %{EVRD} - -%description l10n-dz -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Dzongkha. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - -%package l10n-el -Summary: Greek language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-el -Requires: fonts-type1-greek -Requires: myspell-el -Requires: myspell-hyph-el -Provides: LibreOffice-l10n-el -Obsoletes: openoffice.org-go-ooo-l10n-el <= %{version} -Suggests: %{ooname}-help-el = %{EVRD} -Obsoletes: openoffice.org-l10n-el < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-el <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-el <= 3.1-4 -%endif - -%description l10n-el -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Greek. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-en_GB -Summary: British language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-en -Requires: urw-fonts -Requires: myspell-en_GB -Requires: myspell-hyph-en -Provides: LibreOffice-l10n-en_GB -Obsoletes: openoffice.org-go-ooo-l10n-en_GB <= %{version} -Suggests: %{ooname}-help-en_GB = %{EVRD} -Obsoletes: openoffice.org-l10n-en_GB < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-en_GB <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-en_GB <= 3.1-4 -%endif - -%description l10n-en_GB -LibreOffice is an Open Source, community-developed, office suite. - - package contains the localization of LibreOffice in British. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-es -Summary: Spanish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-es -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-es -Requires: myspell-hyph-es -Provides: LibreOffice-l10n-es -Obsoletes: openoffice.org-go-ooo-l10n-es <= %{version} -Suggests: %{ooname}-help-es = %{EVRD} -Obsoletes: openoffice.org-l10n-es < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-es <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-es <= 3.1-4 -%endif - -%description l10n-es -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Spanish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-et -Summary: Estonian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-et -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-et -Requires: myspell-hyph-et -Provides: LibreOffice-l10n-et -Obsoletes: openoffice.org-go-ooo-l10n-et <= %{version} -Suggests: %{ooname}-help-et = %{EVRD} -Obsoletes: openoffice.org-l10n-et < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-et <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-et <= 3.1-4 -%endif - -%description l10n-et -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Estonian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-eu -Summary: Basque language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-eu -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Provides: LibreOffice-l10n-eu -Obsoletes: openoffice.org-go-ooo-l10n-eu <= %{version} -Suggests: %{ooname}-help-eu = %{EVRD} -Obsoletes: openoffice.org-l10n-eu < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-eu <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-eu <= 3.1-4 -%endif - -%description l10n-eu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Basque. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - -%package l10n-fa -Summary: Farsi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-fa -Provides: LibreOffice-l10n-fa - -%description l10n-fa -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Farsi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-fi -Summary: Finnish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-fi -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: %{ooname}-voikko -Provides: LibreOffice-l10n-fi -Obsoletes: openoffice.org-go-ooo-l10n-fi <= %{version} -Suggests: %{ooname}-help-fi = %{EVRD} -Obsoletes: openoffice.org-l10n-fi < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-fi <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-fi <= 3.1-4 -%endif - -%description l10n-fi -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Finnish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-fr -Summary: French language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-fr -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-fr -Requires: myspell-hyph-fr -Provides: LibreOffice-l10n-fr -Obsoletes: openoffice.org-go-ooo-l10n-fr <= %{version} -Suggests: %{ooname}-help-fr = %{EVRD} -Obsoletes: openoffice.org-l10n-fr < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-fr <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-fr <= 3.1-4 -%endif - -%description l10n-fr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in French. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ga -Summary: Irish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ga -Provides: LibreOffice-l10n-ga - -%description l10n-ga -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Irish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-gl -Summary: Galician language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-gl -Provides: LibreOffice-l10n-gl -Suggests: %{ooname}-help-gl = %{EVRD} - -%description l10n-gl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Galician. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - -%package l10n-gu -Summary: Gujarati language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-gu -Provides: LibreOffice-l10n-gu -Suggests: %{ooname}-help-gu = %{EVRD} - -%description l10n-gu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Gujarati. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-he -Summary: Hebrew language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-he -Requires: urw-fonts -Provides: LibreOffice-l10n-he -Obsoletes: openoffice.org-go-ooo-l10n-he <= %{version} -Suggests: %{ooname}-help-he = %{EVRD} -Obsoletes: openoffice.org-l10n-he < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-he <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-he <= 3.1-4 -%endif - -%description l10n-he -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Hebrew. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-hi -Summary: Hindi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-hi -Requires: urw-fonts -Provides: LibreOffice-l10n-hi -Obsoletes: openoffice.org-go-ooo-l10n-hi <= %{version} -Suggests: %{ooname}-help-hi = %{EVRD} -Obsoletes: openoffice.org-l10n-hi < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-hi <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-hi <= 3.1-4 -%endif - -%description l10n-hi -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Hindi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-hr -Summary: Croatian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-hr -Provides: LibreOffice-l10n-hr -Suggests: %{ooname}-help-hr = %{EVRD} - -%description l10n-hr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Croatian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - -%package l10n-hu -Summary: Hungarian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-hu -Requires: urw-fonts -Requires: myspell-hu -Requires: myspell-hyph-hu -Provides: LibreOffice-l10n-hu -Obsoletes: openoffice.org-go-ooo-l10n-hu <= %{version} -Suggests: %{ooname}-help-hu = %{EVRD} -Obsoletes: openoffice.org-l10n-hu < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-hu <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-hu <= 3.1-4 -%endif - -%description l10n-hu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Hungarian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-it -Summary: Italian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-it -Requires: myspell-hyph-it -Provides: LibreOffice-l10n-it -Obsoletes: openoffice.org-go-ooo-l10n-it <= %{version} -Suggests: %{ooname}-help-it = %{EVRD} -Obsoletes: openoffice.org-l10n-it < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-it <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-it <= 3.1-4 -%endif - -%description l10n-it -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Italian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ja -Summary: Japanese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ja -Requires: fonts-ttf-japanese >= 0.20020727-1mdk -Provides: LibreOffice-l10n-ja -Obsoletes: openoffice.org-go-ooo-l10n-ja <= %{version} -Suggests: %{ooname}-help-ja = %{EVRD} -Obsoletes: openoffice.org-l10n-ja < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-ja <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-ja <= 3.1-4 -%endif - -%description l10n-ja -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Japanese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-kn -Summary: Kannada language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-kn -Provides: LibreOffice-l10n-kn - -%description l10n-kn -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Kannada. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ko -Summary: Korean language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ko -Requires: fonts-ttf-korean >= 2.1 -Provides: LibreOffice-l10n-ko -Obsoletes: openoffice.org-go-ooo-l10n-ko <= %{version} -Suggests: %{ooname}-help-ko = %{EVRD} -Obsoletes: openoffice.org-l10n-ko < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-ko <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-ko <= 3.1-4 -%endif - -%description l10n-ko -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Korean. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-lt -Summary: Lithuanian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-lt -Provides: LibreOffice-l10n-lt - -%description l10n-lt -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Lithuanian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-lv -Summary: Latvian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-lv -Provides: LibreOffice-l10n-lv - -%description l10n-lv -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Latvian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-mai -Summary: Maithili language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-mai -Provides: LibreOffice-l10n-mai - -%description l10n-mai -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Maithili. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ml -Summary: Malayalam language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ml -Provides: LibreOffice-l10n-ml - -%description l10n-ml -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Malayalam. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-mk -Summary: Macedonian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-mk -Provides: LibreOffice-l10n-mk -Obsoletes: openoffice.org-go-ooo-l10n-mk <= %{version} -Suggests: %{ooname}-help-mk = %{EVRD} -Obsoletes: openoffice.org-l10n-mk < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-mk <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-mk <= 3.1-4 -%endif - -%description l10n-mk -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Macedonian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-mr -Summary: Marathi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-mr -Provides: LibreOffice-l10n-mr - -%description l10n-mr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Marathi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-nb -Summary: Norwegian Bokmal language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-no -Requires: urw-fonts -Provides: LibreOffice-l10n-nb -Obsoletes: openoffice.org-go-ooo-l10n-nb <= %{version} -Suggests: %{ooname}-help-nb = %{EVRD} -Obsoletes: openoffice.org-l10n-nb < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-nb <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-nb <= 3.1-4 -%endif - -%description l10n-nb -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Norwegian Bokmal. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-nl -Summary: Dutch language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-nl -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-nl -Requires: myspell-hyph-nl -Provides: LibreOffice-l10n-nl -Obsoletes: openoffice.org-go-ooo-l10n-nl <= %{version} -Suggests: %{ooname}-help-nl = %{EVRD} -Obsoletes: openoffice.org-l10n-nl < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-nl <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-nl <= 3.1-4 -%endif - -%description l10n-nl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Dutch. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-nn -Summary: Norwegian Nynorsk language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-no -Requires: urw-fonts -Provides: LibreOffice-l10n-nn -Obsoletes: openoffice.org-go-ooo-l10n-nn <= %{version} -Suggests: %{ooname}-help-nn = %{EVRD} -Obsoletes: openoffice.org-l10n-nn < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-nn <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-nn <= 3.1-4 -%endif - -%description l10n-nn -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Norwegian Nynorsk. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-nr -Summary: Ndebele language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-nr -Provides: LibreOffice-l10n-nr - -%description l10n-nr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Ndebele. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-nso -Summary: Northern Shoto language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-nso -Provides: LibreOffice-l10n-nso - -%description l10n-nso -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Northern Shoto. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-or -Summary: Oriya language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-or -Provides: LibreOffice-l10n-or - -%description l10n-or -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Oriya. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-pa_IN -Summary: Punjabi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-pa -Provides: LibreOffice-l10n-pa_IN -Provides: LibreOffice-l10n-pa - -%description l10n-pa_IN -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Punjabi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-pl -Summary: Polish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-pl -Requires: urw-fonts -Requires: myspell-pl -Requires: myspell-hyph-pl -Provides: LibreOffice-l10n-pl -Obsoletes: openoffice.org-go-ooo-l10n-pl <= %{version} -Suggests: %{ooname}-help-pl = %{EVRD} -Obsoletes: openoffice.org-l10n-pl < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-pl <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-pl <= 3.1-4 -%endif - -%description l10n-pl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Polish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-pt -Summary: Portuguese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-pt -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-pt -Requires: myspell-hyph-pt -Provides: LibreOffice-l10n-pt -Obsoletes: openoffice.org-go-ooo-l10n-pt <= %{version} -Suggests: %{ooname}-help-pt = %{EVRD} -Obsoletes: openoffice.org-l10n-pt < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-pt <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-pt <= 3.1-4 -%endif - -%description l10n-pt -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Portuguese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-pt_BR -Summary: Portuguese Brazilian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -# Due to alternatives setup, we must have -release here. (BrOffice) -Requires: %{ooname}-common = %{EVRD} -Requires(post): update-alternatives %{ooname}-common -Requires(postun): update-alternatives %{ooname}-common -Requires: locales-pt -Requires: urw-fonts -Requires: myspell-pt_BR -Provides: LibreOffice-l10n_pt_BR -Obsoletes: openoffice.org-go-ooo-l10n-pt_BR <= %{version} -Suggests: %{ooname}-help-pt_BR = %{EVRD} -Obsoletes: openoffice.org-l10n-pt_BR < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-pt_BR <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-pt_BR <= 3.1-4 -%endif - -%description l10n-pt_BR -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Portuguese -Brazilian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ro -Summary: Romanian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ro -Provides: LibreOffice-l10n-ro - -%description l10n-ro -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Romanian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ru -Summary: Russian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ru -Requires: urw-fonts >= 2.0-6mdk -Requires: myspell-ru -Requires: myspell-hyph-ru -Provides: LibreOffice-l10n-ru -Obsoletes: openoffice.org-go-ooo-l10n-ru <= %{version} -Suggests: %{ooname}-help-ru = %{EVRD} -Obsoletes: openoffice.org-l10n-ru < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-ru <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-ru <= 3.1-4 -%endif - -%description l10n-ru -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Russian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-sh -Summary: Secwepemctsin language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sh -Provides: LibreOffice-l10n-sh -Suggests: %{ooname}-help-sh = %{EVRD} - -%description l10n-sh -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Secwepemctsin. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-si -Summary: Sinhalese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-si -Provides: LibreOffice-l10n-si -Suggests: %{ooname}-help-si = %{EVRD} - -%description l10n-si -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Sinhalese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-sk -Summary: Slovak language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sk -Requires: urw-fonts -Requires: myspell-sk -Requires: myspell-hyph-sk -Provides: LibreOffice-l10n-sk -Obsoletes: openoffice.org-go-ooo-l10n-sk <= %{version} -Suggests: %{ooname}-help-sk = %{EVRD} -Obsoletes: openoffice.org-l10n-sk < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-sk <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-sk <= 3.1-4 -%endif - -%description l10n-sk -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Slovak. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-sl -Summary: Slovenian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sl -Requires: urw-fonts -Requires: myspell-sl, myspell-hyph-sl -Provides: LibreOffice-l10n-sl -Obsoletes: openoffice.org-go-ooo-l10n-sl <= %{version} -Suggests: %{ooname}-help-sl = %{EVRD} -Obsoletes: openoffice.org-l10n-sl < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-sl <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-sl <= 3.1-4 -%endif - -%description l10n-sl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Slovenian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-sr -Summary: Serbian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sr -Provides: LibreOffice-l10n-sr - -%description l10n-sr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Serbian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-st -Summary: Sotho language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-st -Provides: LibreOffice-l10n-st - -%description l10n-st -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Sotho. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ss -Summary: Swati language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ss -Provides: LibreOffice-l10n-ss - -%description l10n-ss -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Swati. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-sv -Summary: Swedish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sv -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-sv -Requires: myspell-hyph-sv -Provides: LibreOffice-l10n-sv -Obsoletes: openoffice.org-go-ooo-l10n-sv <= %{version} -Suggests: %{ooname}-help-sv = %{EVRD} -Obsoletes: openoffice.org-l10n-sv < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-sv <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-sv <= 3.1-4 -%endif - -%description l10n-sv -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Swedish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ta -Summary: Tamil language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ta -Requires: urw-fonts -Provides: LibreOffice-l10n-ta -Obsoletes: openoffice.org-go-ooo-l10n-ta <= %{version} -Obsoletes: openoffice.org-l10n-ta < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-ta <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-ta <= 3.1-4 -%endif - -%description l10n-ta -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Tamil. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-te -Summary: Telugu language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-te -Provides: LibreOffice-l10n-te - -%description l10n-te -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Telugu. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-th -Summary: Thai language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-th -Provides: LibreOffice-l10n-th - -%description l10n-th -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Thai. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-tn -Summary: Tswana language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-tn -Provides: LibreOffice-l10n-tn - -%description l10n-tn -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Tswana. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-tr -Summary: Turkish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-tr -Requires: urw-fonts -Provides: LibreOffice-l10n-tr -Obsoletes: openoffice.org-go-ooo-l10n-tr <= %{version} -Suggests: %{ooname}-help-tr = %{EVRD} -Obsoletes: openoffice.org-l10n-tr < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-tr <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-tr <= 3.1-4 -%endif - -%description l10n-tr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Turkish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ts -Summary: Tsonga language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ts -Provides: LibreOffice-l10n-ts - -%description l10n-ts -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Tsonga. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-uk -Summary: Ukrainian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-uk -Provides: LibreOffice-l10n-uk -Suggests: %{ooname}-help-uk = %{EVRD} - -%description l10n-uk -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Ukrainian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-ve -Summary: Venda language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ve -Provides: LibreOffice-l10n-ve - -%description l10n-ve -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Venda. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-xh -Summary: Xhosa language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-xh -Provides: LibreOffice-l10n-xh - -%description l10n-xh -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Xhosa. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-zh_CN -Summary: Chinese Simplified language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-zh -Requires: fonts-ttf-chinese -Provides: LibreOffice-l10n-zh_CN -Obsoletes: openoffice.org-go-ooo-l10n-zh_CN <= %{version} -Suggests: %{ooname}-help-zh_CN = %{EVRD} -Obsoletes: openoffice.org-l10n-zh_CN < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-zh_CN <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-zh_CN <= 3.1-4 -%endif - -%description l10n-zh_CN -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Chinese Simplified. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-zh_TW -Summary: Chinese Traditional language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-zh -Requires: fonts-ttf-chinese -Provides: LibreOffice-l10n-zh_TW -Obsoletes: openoffice.org-go-ooo-l10n-zh_TW <= %{version} -Suggests: %{ooname}-help-zh_TW = %{EVRD} -Obsoletes: openoffice.org-l10n-zh_TW < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-zh_TW <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-zh_TW <= 3.1-4 -%endif - -%description l10n-zh_TW -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Chinese -Traditional. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package l10n-zu -Summary: Zulu language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-zu -Requires: urw-fonts -Requires: myspell-zu -Provides: LibreOffice-l10n-zu -Obsoletes: openoffice.org-go-ooo-l10n-zu <= %{version} -Obsoletes: openoffice.org-l10n-zu < 1:3.3-1:2011.0 -%ifarch x86_64 -Obsoletes: openoffice.org64-l10n-zu <= 1:3.1-4 -Obsoletes: openoffice.org64-go-ooo-l10n-zu <= 3.1-4 -%endif - -%description l10n-zu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localization of LibreOffice in Zulu. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. - - -%package help-bg -Summary: Bulgarian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-bg = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-bg <= 1:3.1-4 -%endif -Provides: LibreOffice-help-bg -Obsoletes: openoffice.org-help-bg < 1:3.3-1:2011.0 - -%description help-bg -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Bulgarian. - -%package help-bn -Summary: Bengali help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-bn = %{EVRD} -Provides: LibreOffice-help-bn - -%description help-bn -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Bengali. - - -%package help-bs -Summary: Bosnian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-bs = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-bs <= 1:3.1-4 -%endif -Provides: LibreOffice-help-bs -Obsoletes: openoffice.org-help-bs < 1:3.3-1:2011.0 - -%description help-bs -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Bosnian. - - -%package help-ca -Summary: Catalan help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ca = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-ca <= 1:3.1-4 -%endif -Provides: LibreOffice-help-ca -Obsoletes: openoffice.org-help-ca < 1:3.3-1:2011.0 - -%description help-ca -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Catalan. - - -%package help-cs -Summary: Czech help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-cs = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-cs <= 1:3.1-4 -%endif -Provides: LibreOffice-help-cs -Obsoletes: openoffice.org-help-cs < 1:3.3-1:2011.0 - -%description help-cs -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Czech. - - -%package help-da -Summary: Danish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-da = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-da <= 1:3.1-4 -%endif -Provides: LibreOffice-help-da -Obsoletes: openoffice.org-help-da < 1:3.3-1:2011.0 - -%description help-da -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Danish. - - -%package help-de -Summary: German help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-de = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-de <= 1:3.1-4 -%endif -Provides: LibreOffice-help-de -Obsoletes: openoffice.org-help-de < 1:3.3-1:2011.0 - -%description help-de -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in German. - -%package help-dz -Summary: Dzongkha help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-dz = %{EVRD} -Provides: LibreOffice-help-dz - -%description help-dz -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Dzongkha. - - -%package help-el -Summary: Greek help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-el = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-el <= 1:3.1-4 -%endif -Provides: LibreOffice-help-el -Obsoletes: openoffice.org-help-el < 1:3.3-1:2011.0 - - -%description help-el -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Greek. - - -%package help-en_GB -Summary: British help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-en_GB = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-en_GB <= 1:3.1-4 -%endif -Provides: LibreOffice-help-en_GB -Obsoletes: openoffice.org-help-en_GB < 1:3.3-1:2011.0 - -%description help-en_GB -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in British. - - -%package help-en_US -Summary: American English help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-en_US <= 1:3.1-4 -%endif -Provides: LibreOffice-help-en_US -Obsoletes: openoffice.org-help-en_US < 1:3.3-1:2011.0 -#Provides: openoffice.org-help-en_US = 1:3.3-1:2011.0 - -%description help-en_US -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice -in American English. - - -%package help-es -Summary: Spanish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-es = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-es <= 1:3.1-4 -%endif -Provides: LibreOffice-help-es -Obsoletes: openoffice.org-help-es < 1:3.3-1:2011.0 - -%description help-es -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Spanish. - - -%package help-et -Summary: Estonian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-et = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-et <= 1:3.1-4 -%endif -Provides: LibreOffice-help-et -Obsoletes: openoffice.org-help-et < 1:3.3-1:2011.0 - -%description help-et -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Estonian. - - -%package help-eu -Summary: Basque help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-eu = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-eu <= 1:3.1-4 -%endif -Provides: LibreOffice-help-eu -Obsoletes: openoffice.org-help-eu < 1:3.3-1:2011.0 - -%description help-eu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Basque. - - -%package help-fi -Summary: Finnish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-fi = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-fi <= 1:3.1-4 -%endif -Provides: LibreOffice-help-fi -Obsoletes: openoffice.org-help-fi < 1:3.3-1:2011.0 - -%description help-fi -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Finnish. - - -%package help-fr -Summary: French help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-fr = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-fr <= 1:3.1-4 -%endif -Provides: LibreOffice-help-fr -Obsoletes: openoffice.org-help-fr < 1:3.3-1:2011.0 - -%description help-fr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in French. - - -%package help-gu -Summary: Gujarati help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-gu = %{EVRD} -Provides: LibreOffice-help-gu - -%description help-gu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Gujarati. - - -%package help-gl -Summary: Galician help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-gl = %{EVRD} -Provides: LibreOffice-help-gl - -%description help-gl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Galician. - - -%package help-he -Summary: Hebrew help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-he = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-he <= 1:3.1-4 -%endif -Provides: LibreOffice-help-he -Obsoletes: openoffice.org-help-he < 1:3.3-1:2011.0 - -%description help-he -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Hebrew. - - -%package help-hi -Summary: Hindi help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-hi = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-hi <= 1:3.1-4 -%endif -Provides: LibreOffice-help-hi -Obsoletes: openoffice.org-help-hi < 1:3.3-1:2011.0 - -%description help-hi -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Hindi. - - -%package help-hr -Summary: Croatian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-hr = %{EVRD} -Provides: LibreOffice-help-hr - -%description help-hr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Croatian. - - -%package help-hu -Summary: Hungarian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-hu = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-hu <= 1:3.1-4 -%endif -Provides: LibreOffice-help-hu -Obsoletes: openoffice.org-help-hu < 1:3.3-1:2011.0 - -%description help-hu -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Hungarian. - - -%package help-it -Summary: Italian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-it = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-it <= 1:3.1-4 -%endif -Provides: LibreOffice-help-it -Obsoletes: openoffice.org-help-it < 1:3.3-1:2011.0 - -%description help-it -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Italian. - - -%package help-ja -Summary: Japanese help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ja = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-ja <= 1:3.1-4 -%endif -Provides: LibreOffice-help-ja -Obsoletes: openoffice.org-help-ja < 1:3.3-1:2011.0 - -%description help-ja -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Japanese. - - -%package help-ko -Summary: Korean help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ko = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-ko <= 1:3.1-4 -%endif -Provides: LibreOffice-help-ko -Obsoletes: openoffice.org-help-ko < 1:3.3-1:2011.0 - -%description help-ko -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Korean. - - -%package help-mk -Summary: Macedonian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-mk = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-mk <= 1:3.1-4 -%endif -Provides: LibreOffice-help-mk -Obsoletes: openoffice.org-help-mk < 1:3.3-1:2011.0 - -%description help-mk -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Macedonian. - - -%package help-nb -Summary: Norwegian Bokmal help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-nb = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-nb <= 1:3.1-4 -%endif -Provides: LibreOffice-help-nb -Obsoletes: openoffice.org-help-nb < 1:3.3-1:2011.0 - -%description help-nb -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Norwegian -Bokmal. - - -%package help-nl -Summary: Dutch help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-nl = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-nl <= 1:3.1-4 -%endif -Provides: LibreOffice-help-nl -Obsoletes: openoffice.org-help-nl < 1:3.3-1:2011.0 - -%description help-nl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Dutch. - - -%package help-nn -Summary: Norwegian Nynorsk help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-nn = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-nn <= 1:3.1-4 -%endif -Provides: LibreOffice-help-nn -Obsoletes: openoffice.org-help-nn < 1:3.3-1:2011.0 - -%description help-nn -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Norwegian -Nynorsk. - - -%package help-pl -Summary: Polish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-pl = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-pl <= 1:3.1-4 -%endif -Provides: LibreOffice-help-pl -Obsoletes: openoffice.org-help-pl < 1:3.3-1:2011.0 - -%description help-pl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Polish. - - -%package help-pt -Summary: Portuguese help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-pt = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-pt <= 1:3.1-4 -%endif -Provides: LibreOffice-help-pt -Obsoletes: openoffice.org-help-pt < 1:3.3-1:2011.0 - -%description help-pt -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Portuguese. - - -%package help-pt_BR -Summary: Portuguese Brazilian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-pt_BR = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-pt_BR <= 1:3.1-4 -%endif -Provides: LibreOffice-help-pt_BR -Obsoletes: openoffice.org-help-pt_BR < 1:3.3-1:2011.0 - -%description help-pt_BR -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Portuguese -Brazilian. - - -%package help-ru -Summary: Russian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ru = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-ru <= 1:3.1-4 -%endif -Provides: LibreOffice-help-ru -Obsoletes: openoffice.org-help-ru < 1:3.3-1:2011.0 - -%description help-ru -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Russian. - - -%package help-si -Summary: Sinhalese help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-si = %{EVRD} -Provides: LibreOffice-help-si - -%description help-si -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Sinhalese. - - -%package help-sk -Summary: Slovak help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-sk = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-sk <= 1:3.1-4 -%endif -Provides: LibreOffice-help-sk -Obsoletes: openoffice.org-help-sk < 1:3.3-1:2011.0 - -%description help-sk -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Slovak. - - -%package help-sl -Summary: Slovenian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-sl = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-sl <= 1:3.1-4 -%endif -Provides: LibreOffice-help-sl -Obsoletes: openoffice.org-help-sl < 1:3.3-1:2011.0 - -%description help-sl -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Slovenian. - - -%package help-sv -Summary: Swedish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-sv = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-sv <= 1:3.1-4 -%endif -Provides: LibreOffice-help-sv -Obsoletes: openoffice.org-help-sv < 1:3.3-1:2011.0 - -%description help-sv -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Swedish. - - -%package help-tr -Summary: Turkish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-tr = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-tr <= 1:3.1-4 -%endif -Provides: LibreOffice-help-tr -Obsoletes: openoffice.org-help-tr < 1:3.3-1:2011.0 - -%description help-tr -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Turkish. - - -%package help-uk -Summary: Ukrainian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-uk = %{EVRD} -Provides: LibreOffice-help-uk - -%description help-uk -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Ukrainian. - - -%package help-zh_CN -Summary: Chinese Simplified help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-zh_CN = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-zh_CN <= 1:3.1-4 -%endif -Provides: LibreOffice-help-zn_CN -Obsoletes: openoffice.org-help-zn_CN < 1:3.3-1:2011.0 - -%description help-zh_CN -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Chinese -Simplified. - - -%package help-zh_TW -Summary: Chinese Traditional help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-zh_TW = %{EVRD} -%ifarch x86_64 -Obsoletes: openoffice.org64-help-zh_TW <= 1:3.1-4 -%endif -Provides: LibreOffice-help-zn_CT -Obsoletes: openoffice.org-help-zn_CT < 1:3.3-1:2011.0 - -%description help-zh_TW -LibreOffice is an Open Source, community-developed, office suite. - -This package contains the localized help files of LibreOffice in Chinese -Traditional. - +# All remaining arguments are considered to be files and added to the file +# list. +# +# Aa: autocorr dependency +# Ff: font language dependency +# Hh: hunspell dependency +# l: language code, e.g., cs +# Mm: mythes dependency +# n: language name, e.g., Czech +# Oo: Obsoletes: of openoffice.org-langpack +# r: comma-separated list of additional requires +# Ss: filelist +# Yy: hyphen dependency +# +# Example: +# libreoffice-langpack-cs: langpack for Czech lang. requiring hyphen-cs, +# autocorr-cs, mythes-cs-CZ and suitable font, obsoleting +# openoffice.org-langpack-cs_CZ, and taking the files from cs.filelist: +# %%langpack -l cs -n Czech -H -A -m cs-CZ -o cs_CZ -S +%define langpack(Aa:Ff:Hh:l:Mm:n:Oo:p:r:Ss:Yy:Uu:) \ +%define project LibreOffice \ +%define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ +%define pkgname langpack-%{lang} \ +%define langname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ +\ +%package %{pkgname} \ +Summary: %{langname} language pack for %{project} \ +Group: Office \ +Requires: %{name}-core = %{version}-%{release} \ +Obsoletes: openoffice.org-l10n-%{lang} < 1:3.3.1 \ +Provides: openoffice.org-l10n-%{lang} = 1:%version-%release \ +Provides: %name-langpack = %version-%release \ +%{-a:Requires: autocorr-%{-a*}}%{!-a:%{-A:Requires: autocorr-%{lang}}} \ +%{-f:Requires: font(:lang=%{-f*})}%{!-f:%{-F:Requires: font(:lang=%{lang})}} \ +%{-h:Requires: hunspell-%{-h*}}%{!-h:%{-H:Requires: hunspell-%{lang}}} \ +%{-m:Requires: mythes-%{-m*}}%{!-m:%{-M:Requires: mythes-%{lang}}} \ +%{-u:Requires: locales-%{-u*}} \ +%{-U:Requires: locales-%{lang}} \ +%{-y:Requires: hyphen-%{-y*}}%{!-y:%{-Y:Requires: hyphen-%{lang}}} \ +%{-r:Requires: %{-r*}} \ +%define obs openoffice.org-langpack \ +%define obsv 1:3.3.1 \ +%{-o:Obsoletes: %{obs}-%{-o*} < %{obsv}}%{!-o:%{-O:Obsoletes: %{obs}-%{lang} < %{obsv}}} \ +%{-p:Provides: %{name}-langpack-%{-p*}} \ +\ +%description %{pkgname} \ +Provides additional %{langname} translations and resources for %{project}. \ +\ +%define filelist %{-s:-f %{-s*}.filelist}%{!-s:%{-S:-f %{lang}.filelist}} \ +%files %{pkgname} %{filelist} \ +%defattr(-,root,root,-) \ +%* + +%define helplangpack(Aa:Ff:Hh:l:Mm:n:Oo:r:Ss:Yy:Uu:) \ +%define project LibreOffice \ +%define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ +%define hlppkgname help-%{lang} \ +%define hlplangname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ +\ +%package %{hlppkgname} \ +Summary: %{hlplangname} language pack for %{project} \ +Group: Office \ +Requires: %{name}-core = %{version}-%{release} \ +Obsoletes: openoffice.org-help-%{lang} < 1:3.3.1 \ +Provides: openoffice.org-help-%{lang} = 1:%version-%release \ +\ +%define hlpobs openoffice.org-help \ +%define hlpobsv 1:3.3.1 \ +%{-o:Obsoletes: %{hlpobs}-%{-o*} < %{hlpobsv}}%{!-o:%{-O:Obsoletes: %{hlpobs}-%{lang} < %{hlpobsv}}} \ +\ +%description %{hlppkgname} \ +Provides additional %{hlplangname} help resources for %{project}. \ +\ +%define hlpfilelist %{-s:-f %{-s*}.help.filelist}%{!-s:%{-S:-f %{lang}.help.filelist}} \ +%files %{hlppkgname} %{hlpfilelist} \ +%defattr(-,root,root,-) \ +%* + +# Defines an auto-correction subpackage. +# +# l: language code +# n: language name +# X do not use default file match on %%{_datadir}/autocorr/acor_%%{lang}-* +# in file list +# +# All remaining arguments are considered to be files and added to the file +# list. +%define autocorr(l:n:X) \ +%define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ +%define pkgname autocorr-%{lang} \ +%define langname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ +\ +%package -n %{pkgname} \ +Summary: %{langname} auto-correction rules \ +Group: Text tools \ +BuildArch: noarch \ +\ +%description -n %{pkgname} \ +Rules for auto-correcting common %{langname} typing errors. \ +\ +%files -n %{pkgname} \ +%defattr(-,root,root,-) \ +%doc solver/unxlng*/bin/ure/LICENSE \ +%dir %{_datadir}/autocorr \ +%{!-X:%{_datadir}/autocorr/acor_%{lang}-*} \ +%* + + +%if %{langpacks} +%langpack -l af -n Afrikaans -F -H -Y -A -o af_ZA -S -U +%langpack -l ar -n Arabic -F -H -O -S -U +%langpack -l as -n Assamese -F -H -Y -o as_IN -S -U +%langpack -l bg -n Bulgarian -F -H -Y -M -A -o bg_BG -S -U +%langpack -l bn -n Bengali -F -H -Y -O -S -U +#langpack -l br -n Breton -F -O -S -U -u fr +%langpack -l ca -n Catalan -F -H -Y -M -o ca_ES -S -U +%langpack -l cs -n Czech -F -H -Y -M -A -o cs_CZ -S -U +%langpack -l cy -n Welsh -F -H -Y -o cy_GB -S -U +%langpack -l da -n Danish -F -H -Y -M -A -o da_DK -S -U +%langpack -l de -n German -F -H -Y -M -A -O -S -U +%langpack -l dz -n Dzongkha -F -O -S -U +%langpack -l el -n Greek -F -H -Y -M -o el_GR -S -U +%langpack -l en -n English -M -O -U -A -Y -H +%langpack -l es -n Spanish -F -H -Y -M -A -O -S -U +%langpack -l et -n Estonian -F -H -Y -o et_EE -S -U +%langpack -l eu -n Basque -F -H -Y -A -o eu_ES -S -U +#langpack -l fa -n Farsi -A -H -Y -S +%langpack -l fi -n Finnish -F -r libreoffice-voikko -A -o fi_FI -S -U +%langpack -l fr -n French -F -H -Y -M -A -O -S -U +%langpack -l ga -n Irish -F -H -Y -M -A -o ga_IE -S -U +%langpack -l gl -n Galician -F -H -Y -o gl_ES -S -U +%langpack -l gu -n Gujarati -F -H -Y -o gu_IN -S -U +%langpack -l he -n Hebrew -F -H -o he_IL -S -U +%langpack -l hi -n Hindi -F -H -Y -o hi_IN -S -U +%langpack -l hr -n Croatian -F -H -Y -A -o hr_HR -S -U +%langpack -l hu -n Hungarian -F -H -Y -M -A -o hu_HU -S -U +%langpack -l it -n Italian -F -H -Y -M -A -O -S -U +%langpack -l ja -n Japanese -F -A -o ja_JP -S -U +%langpack -l kn -n Kannada -F -H -Y -o kn_IN -S -U +%langpack -l ko -n Korean -F -H -A -o ko_KR -S -U +%{baseinstdir}/share/registry/korea.xcd + +%langpack -l lt -n Lithuanian -F -H -Y -A -o lt_LT -S -U +#langpack -l lv -n Latvian -F -H -Y -M -S +%langpack -l mai -n Maithili -F -o mai_IN -S -U +%langpack -l ml -n Malayalam -F -H -Y -o ml_IN -S -U +%langpack -l mr -n Marathi -F -H -Y -o mr_IN -S -U +%langpack -l nb -n Bokmal -F -H -Y -M -o nb_NO -S -u no +%langpack -l nl -n Dutch -F -H -Y -M -A -O -S -U +%langpack -l nn -n Nynorsk -F -H -Y -M -o nn_NO -S -u no +%define langpack_lang Southern Ndebele +%langpack -l nr -n %{langpack_lang} -F -H -o nr_ZA -S -U +%define langpack_lang Northern Sotho +%langpack -l nso -n %{langpack_lang} -F -H -o nso_ZA -S +%langpack -l or -n Oriya -F -H -Y -o or_IN -S -U +%langpack -l pa -n Punjabi -F -H -Y -O -s pa-IN -U +%langpack -l pl -n Polish -F -H -Y -M -A -o pl_PL -S -U +%define langpack_lang Brazilian Portuguese +%langpack -l pt-BR -n %{langpack_lang} -f pt -h pt -y pt -m pt -a pt -o pt_BR -p pt_BR -S -u pt +%langpack -l pt-PT -n Portuguese -f pt -h pt -y pt -m pt -a pt -o pt_PT -p pt_PT -s pt -u pt +%langpack -l ro -n Romanian -F -H -Y -M -O -S -U +%langpack -l ru -n Russian -F -H -Y -M -A -O -S -U +%langpack -l si -n Sinhalese -F -H -O -S -U +%langpack -l sk -n Slovak -F -H -Y -M -A -o sk_SK -S -U +%langpack -l sl -n Slovenian -F -H -Y -M -A -o sl_SI -S -U +%langpack -l sr -n Serbian -F -H -Y -A -O -S -U +%langpack -l ss -n Swati -F -H -o ss_ZA -S -U +%define langpack_lang Southern Sotho +%langpack -l st -n %{langpack_lang} -F -H -o st_ZA -S -U +%langpack -l sv -n Swedish -F -H -Y -M -A -O -S -U +%langpack -l ta -n Tamil -F -H -Y -o ta_IN -S -U +%langpack -l te -n Telugu -F -H -Y -o te_IN -S -U +%langpack -l th -n Thai -F -H -o th_TH -S -U +%{baseinstdir}/share/registry/ctlseqcheck_th.xcd + +%langpack -l tn -n Tswana -F -H -o tn_ZA -S -U +%langpack -l tr -n Turkish -F -A -o tr_TR -S -U +%langpack -l ts -n Tsonga -F -H -o ts_ZA -S -U +%langpack -l uk -n Ukrainian -F -H -Y -M -O -S -U +%langpack -l ve -n Venda -F -H -o ve_ZA -S -U +%langpack -l xh -n Xhosa -F -H -o xh_ZA -S -U +%define langpack_lang Simplified Chinese +%langpack -l zh_CN -n %{langpack_lang} -f zh-cn -a zh -o zh_CN -s zh-CN -u zh +%define langpack_lang Traditional Chinese +%langpack -l zh_TW -n %{langpack_lang} -f zh-tw -a zh -o zh_TW -s zh-TW -u zh +%langpack -l zu -n Zulu -F -H -Y -o zu_ZA -S -U +%undefine langpack_lang +%endif + +%autocorr -l en -n English + +%if %{langpacks} +%autocorr -l af -n Afrikaans +%autocorr -l bg -n Bulgarian +%autocorr -l cs -n Czech +%autocorr -l da -n Danish +%autocorr -l de -n German +%autocorr -l es -n Spanish +%autocorr -l eu -n Basque -X +%{_datadir}/autocorr/acor_eu.dat + +%autocorr -l fa -n Farsi +%autocorr -l fi -n Finnish +%autocorr -l fr -n French +%autocorr -l ga -n Irish +%autocorr -l hr -n Croatian +%autocorr -l hu -n Hungarian +%autocorr -l it -n Italian +%autocorr -l ja -n Japanese +%autocorr -l ko -n Korean +%autocorr -l lb -n Luxembourgish +%autocorr -l lt -n Lithuanian +%autocorr -l mn -n Mongolian +%autocorr -l nl -n Dutch +%autocorr -l pl -n Polish +%autocorr -l pt -n Portuguese +%autocorr -l ru -n Russian +%autocorr -l sk -n Slovak +%autocorr -l sl -n Slovenian +%autocorr -l sr -n Serbian +%{_datadir}/autocorr/acor_sh-* + +%autocorr -l sv -n Swedish +%autocorr -l tr -n Turkish +%autocorr -l vi -n Vietnamese +%autocorr -l zh -n Chinese +%endif + +%helplangpack -l en -n English + +%if %{langpacks} +#helplangpack -l ar -n Arabic -S +%helplangpack -l bg -n Bulgarian -S +%helplangpack -l bn -n Bengali -S +#helplangpack -l br -n Breton -S +%helplangpack -l ca -n Catala -S +%helplangpack -l cs -n Czech -S +%helplangpack -l da -n Danish -S +%helplangpack -l de -n German -S +%helplangpack -l dz -n Dzongkha -S +%helplangpack -l el -n Greek -S +%helplangpack -l es -n Spanish -S +%helplangpack -l et -n Estonian -S +%helplangpack -l eu -n Basque -S +%helplangpack -l fi -n Finnish -S +%helplangpack -l fr -n French -S +%helplangpack -l gl -n Galician -S +%helplangpack -l hi -n Hindi -S +%helplangpack -l hu -n Hungarian -S +%helplangpack -l it -n Italian -S +%helplangpack -l ja -n Japanese -S +%helplangpack -l ko -n Korean -S +#helplangpack -l mai -n Maithili -S +%helplangpack -l nb -n Bokmal -S +%helplangpack -l nl -n Dutch -S +%helplangpack -l nn -n Nynorsk -S +%define langpack_lang Southern Ndebele +#helplangpack -l nr -n %{langpack_lang} -S +%define langpack_lang Northern Sotho +#helplangpack -l nso -n %{langpack_lang} -S +#helplangpack -l pa -n Punjabi -s pa-IN +%helplangpack -l pl -n Polish -S +%define langpack_lang Brazilian Portuguese +%helplangpack -l pt_BR -n %{langpack_lang} -s pt-BR +%helplangpack -l pt -n Portuguese -s pt +%helplangpack -l ru -n Russian -S +#helplangpack -l sh -n Secwepemctsin -S +%helplangpack -l si -n Sinhalese -S +%helplangpack -l sk -n Slovak -S +%helplangpack -l sl -n Slovenian -S +#helplangpack -l sr -n Serbian -S +%define langpack_lang Southern Sotho +#helplangpack -l st -n %{langpack_lang} -S +#helplangpack -l ss -n Swati -S +%helplangpack -l sv -n Swedish -S +#helplangpack -l ta -n Tamil -S +#helplangpack -l tn -n Tswana -S +#helplangpack -l th -n Thai -S +%helplangpack -l tr -n Turkish -S +#helplangpack -l ts -n Tsonga -S +%helplangpack -l uk -n Ukrainian -S +#helplangpack -l ve -n Venda -S +#helplangpack -l xh -n Xhosa -S +%define langpack_lang Simplified Chinese +%helplangpack -l zh_CN -n %{langpack_lang} -s zh-CN +%define langpack_lang Traditional Chinese +%helplangpack -l zh_TW -n %{langpack_lang} -s zh-TW +#helplangpack -l zu -n Zulu -S %endif %prep -%setup -q -c -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 - +%setup -q -c -a 1 -a 2 -a 3 -a 21 +rm -rf git-hooks */git-hooks for a in */*; do mv `pwd`/$a .; done -#ant -%if %javaless -tar -xjvf %{SOURCE60} -%endif +%patch1 -p1 +%patch2 -p1 -b .ooo86080.unopkg.bodge.patch +%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch +%patch4 -p1 -b .oooXXXXX.solenv.allowmissing.patch +%patch5 -p1 -b .ooo101274.opening-a-directory.patch +%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch +%patch7 -p1 -b .libreoffice-installfix.patch +%patch15 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch +%patch16 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch +%patch17 -p1 -b .ensure-non-broken-xml-tree.patch +%patch18 -p1 -b .preserve-timestamps-for-.py-files.patch +%patch19 -p1 -b .rhbz788045-swriter-help-etc-doesn-t-show-h.patch +%patch20 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch +%patch21 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch +%patch22 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +%patch23 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch +%patch24 -p1 -b .do-not-complain-about-soffice-command-line-o.patch +%patch25 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch +%patch26 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch +%patch27 -p1 -b .save-register-arguments-first.patch +%patch28 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch +%patch29 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch +%patch30 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch +%patch32 -p1 -b .use-ure-instead-of-ure-link.patch +%patch33 -p1 -b .rhbz-838368-view-ignored-while-view-accepte.patch +%patch34 -p1 -b .rhbz-838248-init-filter-criteria-string.patch -%patch4 -p0 -b .xul -%patch5 -p0 -b .sysui -%patch6 -p1 -b .kde48 -%patch9 -p0 -b .vba -%patch10 -p0 -b .vclkde -%patch11 -p1 -b .sdext -%patch12 -p0 -b .ucb -%patch13 -p0 -b .xmlhelp -%patch14 -p0 -b .gcc462 +%patch100 -p0 -b .xmlhelp -# Add lzma support (REVIEW) -%if %{oootarext} == "lzma" -%patch1 -p1 -b .lzma -%endif - -# to make the friggin cppunit tests work -mkdir -p ~/tmp -chmod 777 ~/tmp +# TODO: check this +# these are horribly incomplete--empty translations and copied english +# strings with spattering of translated strings +rm -rf translations/source/{gu,he,hr}/helpcontent2 %build +echo build start time is `date`, diskspace: `df -h . | tail -n 1` +#don't build localized helps which aren't translated +POORHELPS=`ls -d translations/source/*/helpcontent2 translations/source/*|cut -f 3 -d /|sort|uniq -u|xargs` +#don't build localized helps which are poorly translated +POORHELPS="$POORHELPS `grep 'msgstr .Working with Documents' translations/source/*/helpcontent2/source/text/swriter/guide.po| cut -f 3 -d / | xargs`" +#convert _smp_mflags to dmake equivalent +SMP_MFLAGS=%{?_smp_mflags} +SMP_MFLAGS=$[${SMP_MFLAGS/-j/}] +if [ $SMP_MFLAGS -lt 2 ]; then SMP_MFLAGS=2; fi +NDMAKES=`dc -e "$SMP_MFLAGS v p"` +NBUILDS=`dc -e "$SMP_MFLAGS $NDMAKES / p"` -# Workaround for bug http://qa.mandriva.com/show_bug.cgi?id=27771 -# if [ -z $QTDIR ]; then -# . /etc/profile.d/60qt4.sh -# fi -export QT4DIR=%{_libdir}/qt4 -%ifarch X86_64 - export QT4INC=/usr/lib/qt4/include -%else - export QT4INC=%{_libdir}/qt4/include +# KDE bits +export QT4DIR=%{qt4dir} +export KDE4DIR=%{_kde_prefix} +export PATH=$QT4DIR/bin:$PATH + +#use the RPM_OPT_FLAGS but remove the OOo overridden ones +for i in $RPM_OPT_FLAGS; do + case "$i" in + -pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" +done +export ARCH_FLAGS +export CFLAGS=$ARCH_FLAGS +export CXXFLAGS=$ARCH_FLAGS + +autoconf +# TODO: review the options +# TODO: --with-poor-help-localizations is gone, IIRC + +%configure \ + %vendoroption --with-num-cpus=$NBUILDS --with-max-jobs=$NDMAKES \ + --with-build-version="%{version}-%{release}" --with-unix-wrapper=%{name} \ + --disable-ldap --disable-epm --disable-mathmldtd \ + --disable-gnome-vfs --enable-gio --enable-symbols --enable-lockdown \ + --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl --enable-vba \ + --enable-ext-presenter-minimizer --enable-ext-nlpsolver \ +%if %{with binfilter} + --enable-binfilter \ %endif -export QT4LIB=%{_libdir}/qt4/lib + --enable-ext-presenter-console --enable-ext-pdfimport \ + --enable-ext-wiki-publisher --enable-ext-report-builder \ + --enable-ext-scripting-beanshell --enable-ext-scripting-javascript \ + --enable-kde4 --without-system-servlet-api \ + --with-system-jars --with-vba-package-format="builtin" \ + --with-system-libs --with-system-headers --with-system-mozilla \ + --without-system-mozilla-headers --with-system-mythes --with-system-dicts \ + --without-system-saxon --with-external-dict-dir=/usr/share/myspell \ + --without-myspell-dicts --without-fonts --without-ppds --without-afms \ + %{with_lang} --with-poor-help-localizations="$POORHELPS" \ + --with-external-tar=`pwd`/ext_sources --with-java-target-version=1.5 \ + --without-system-hsqldb \ + --without-system-sampleicc -export KDE4DIR=%{_libdir}/kde4 -%ifarch X86_64 - export KDE4INC=/usr/lib/kde4/include -%else - export KDE4INC=%{_libdir}/kde4/include -%endif -export KDE4LIB=%{_libdir}/kde4/lib - -%if !%{use_icecream} -# sbin due to icu stuff there -#PATH=/bin:/usr/bin:/usr/X11R6/bin:$QTPATH:/usr/sbin:$PATH -PATH=$PATH:/usr/sbin -export PATH -%endif - -%if %{use_ccache} -export CCACHE_DIR=%{ccachedir} -%endif - -export ARCH_FLAGS="%{optflags} %{optsafe} -fno-omit-frame-pointer -fno-strict-aliasing" -export ARCH_FLAGS_CC="%{optflags} %{optsafe} -fno-omit-frame-pointer -fno-strict-aliasing" -export ARCH_FLAGS_CXX="%{optflags} %{optsafe} -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" -export ARCH_FLAGS_OPT="%{optflags} -O2 %{optsafe}" - -echo "Configure start at: "`date` >> ooobuildtime.log - -ENVCFLAGS="%{optflags} %{optsafe} -g0 -fno-omit-frame-pointer -fno-strict-aliasing" \ -ENVCXXFLAGS="%{optflags} %{optsafe} -g0 -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden " \ -%configure2_5x \ - --with-distro=%{distroname} \ - --with-vendor=Mandriva \ - --with-build-version="%{buildver}" \ - --with-system-stdlibs \ - --disable-qadevooo \ - --enable-lockdown \ - --enable-opengl \ - --enable-odk \ - --enable-split-app-modules \ - --enable-split-opt-features \ - --enable-binfilter \ - --with-system-mozilla=xulrunner \ - --with-system-icu \ - --with-system-xrender-headers \ - --with-system-jpeg \ - --with-system-hunspell \ - --with-system-zlib \ - --with-system-openssl \ - --with-system-expat \ - --with-system-libxml \ - --with-system-python \ - --with-system-xslt \ - --with-system-curl \ - --with-system-vigra \ - --with-system-neon \ - --with-system-agg \ - --with-system-libtextcat \ - --with-external-libtextcat-data \ - --with-system-libwpd \ - --with-system-libwps \ - --with-system-libwpg \ - --with-system-graphite \ - --with-system-translate-toolkit \ - --without-junit \ - --with-system-cppunit \ - --enable-broffice \ - --with-system-redland \ - --with-openldap \ - --disable-kde \ - --enable-kde4 \ - --with-intro-bitmaps="%{SOURCE27}" \ - --with-about-bitmaps="%{SOURCE28}" \ -%if %javaless - --with-ant-home=%{_builddir}/libreoffice-%version/apache-ant-1.8.1/ \ -%else - --with-system-hsqldb \ - --with-system-apache-commons \ -%endif -%if %{use_systemdb} - --with-system-db \ -%endif -%if %{use_systemboost} - --with-system-boost \ -%endif - --with-lang=%{langs} \ - --with-installed-ooo-dirname=ooo \ - --with-docdir=%{_datadir}/doc/packages/ooo \ - --with-system-sane-header \ - --with-system-cairo \ - --without-myspell-dicts \ - --with-system-dicts \ - --with-external-dict-dir=%{_datadir}/dict/ooo \ - --with-external-hyph-dir=%{_datadir}/dict/ooo \ - --with-external-thes-dir=%{_datadir}/dict/ooo \ - --with-system-poppler \ - --enable-ext-pdfimport \ - --enable-ext-presenter-minimizer \ - --enable-ext-presenter-console \ - --enable-ext-wiki-publisher \ - --without-fonts \ -%if %{use_openclipart} - --with-openclipart=%{_datadir}/images/openclipart \ -%endif -%if %{use_mono} -# dev300 - --enable-mono \ -# --with-mono-gac-root=%{_libdir} \ -%endif -%if %{use_smp} - --with-num-cpus=${RPM_BUILD_NCPUS:-1} \ -%endif -%if %{use_ccache} && !%{use_icecream} - --with-gcc-speedup=ccache \ -%else - %if !%{use_ccache} && %{use_icecream} - --with-gcc-speedup=icecream \ - --with-max-jobs=10 \ - --with-icecream-bindir=%{_libdir}/icecc/bin - %else - %if %{use_ccache} && %{use_icecream} - --with-gcc-speedup=ccache,icecream \ - --with-max-jobs=10 \ - --with-icecream-bindir=%{_libdir}/icecc/bin - %endif - %endif -%endif - -echo "Configure end at: "`date` >> ooobuildtime.log -echo "Make start at: "`date` >> ooobuildtime.log - -# some configs to improve build process -# http://wiki.services.openoffice.org/wiki/Building_OpenOffice.org -# needs to check if it does any effect -export nodep=TRUE -export NO_HIDS=TRUE -export MAXPROCESS=4 - -mkdir -p src -ln -sf %{SOURCE31} src/ -ln -sf %{SOURCE32} src/ -#ln -sf %{SOURCE33} src/ -#ln -sf %{SOURCE34} src/ -#ln -sf %{SOURCE35} src/ -ln -sf %{SOURCE36} src/ -ln -sf %{SOURCE37} src/ -ln -sf %{SOURCE38} src/ -ln -sf %{SOURCE39} src/ -ln -sf %{SOURCE40} src/ -ln -sf %{SOURCE42} src/ -ln -sf %{SOURCE43} src/ -ln -sf %{SOURCE44} src/ -ln -sf %{SOURCE45} src/ -ln -sf %{SOURCE46} src/ -ln -sf %{SOURCE47} src/ -ln -sf %{SOURCE48} src/ -ln -sf %{SOURCE49} src/ -ln -sf %{SOURCE50} src/ -ln -sf %{SOURCE51} src/ -ln -sf %{SOURCE52} src/ -ln -sf %{SOURCE54} src/ -ln -sf %{SOURCE55} src/ -ln -sf %{SOURCE56} src/ -%if %javaless -ln -sf %{SOURCE57} src/ -ln -sf %{SOURCE58} src/ -ln -sf %{SOURCE59} src/ -ln -sf %{SOURCE61} src/ -%endif +mkdir -p ext_sources +cp %{SOURCE4} ext_sources +cp %{SOURCE7} ext_sources +cp %{SOURCE8} ext_sources +cp %{SOURCE9} ext_sources +cp %{SOURCE10} ext_sources +cp %{SOURCE11} ext_sources +cp %{SOURCE12} ext_sources +cp %{SOURCE13} ext_sources +cp %{SOURCE14} ext_sources +cp %{SOURCE15} ext_sources +cp %{SOURCE22} ext_sources touch src.downloaded -#. ./*[Ee]nv.[Ss]et.sh +. ./Env.Host.sh ./bootstrap -# %make -make \ - ARCH_FLAGS="%{optflags} %{optsafe} -fno-omit-frame-pointer -fno-strict-aliasing" \ - ARCH_FLAGS_CC="%{optflags} %{optsafe} -fno-omit-frame-pointer -fno-strict-aliasing" \ - ARCH_FLAGS_CXX="%{optflags} %{optsafe} -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" \ - ARCH_FLAGS_OPT="%{optflags} -O2 %{optsafe}" +#HANGING JAVA HACK +cat << \EOF > solenv/bin/java +#!/bin/sh +status=1 +count=1 +while [ $status -ne 0 -a $count -lt 10 ] +do + timeout -k 5m 5m $REALJAVA $* + status=$? + if [ $status -ne 0 ]; then + echo $REALJAVA hung, trying again, attempt $count + fi + count=$[count+1] +done +exit $status +EOF +chmod +x solenv/bin/java +export REALJAVA=`which java` +export PATH=solenv/bin:$PATH +which java +#HANGING JAVA HACK -echo "Make end at: "`date` >> ooobuildtime.log -echo "Install start at: "`date` >> ooobuildtime.log +cd instsetoo_native +if ! VERBOSE=true build --dlv_switch -link -P$NBUILDS --all -- -P$NDMAKES -s; then + build --dlv_switch -link --all +fi + +#generate the icons and mime type stuff +export DESTDIR=../../../output +export KDEMAINDIR=/usr +export GNOMEDIR=/usr +export GNOME_MIME_THEME=hicolor +cd ../sysui +cd unxlng*/misc/libreoffice +./create_tree.sh + +echo build end time is `date`, diskspace: `df -h . | tail -n 1` %install -# sbin due to icu stuff there -PATH=$PATH:/usr/sbin - -rm -rf %{buildroot} -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 - -# # (Review) -# # desktop files -# desktop-file-install --vendor="" \ -# --remove-category="Application" \ -# --add-category="Office" \ -# --add-category="X-MandrivaLinux-CrossDesktop" \ -# --add-mime-type="application/vnd.ms-works;application/x-msworks-wp;zz-application/zz-winassoc-wps" \ -# --add-mime-type="application/vnd.openxmlformats-officedocument.wordprocessingml.document" \ -# --add-mime-type="application/vnd.ms-word.document.macroEnabled.12" \ -# --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/writer*desktop -# -# desktop-file-install --vendor="" \ -# --remove-category="Application" \ -# --add-category="Office" \ -# --add-category="X-MandrivaLinux-CrossDesktop" \ -# --add-mime-type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" \ -# --add-mime-type="application/vnd.ms-excel.sheet.macroEnabled.12" \ -# --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/calc*desktop -# -# desktop-file-install --vendor="" \ -# --remove-category="Application" \ -# --remove-category="Graphics" \ -# --remove-category="VectorGraphics" \ -# --add-category="Office" \ -# --add-category="X-MandrivaLinux-CrossDesktop" \ -# --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/draw*desktop -# -# desktop-file-install --vendor="" \ -# --remove-category="Application" \ -# --add-category="Office" \ -# --add-category="X-MandrivaLinux-CrossDesktop" \ -# --add-mime-type="application/vnd.openxmlformats-officedocument.presentationml.presentation" \ -# --add-mime-type="application/vnd.ms-powerpoint.presentation.macroEnabled.12" \ -# --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/impress*desktop -# -# desktop-file-install --vendor="" \ -# --remove-category="Application" \ -# --add-category="Office" \ -# --add-category="X-MandrivaLinux-CrossDesktop" \ -# --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/math*desktop -# -# # desktop-file-install --vendor="" \ -# # --remove-category="Application" \ -# # --remove-category="Network" \ -# # --remove-category="WebDevelopment" \ -# # --add-category="Office" \ -# # --add-category="X-MandrivaLinux-CrossDesktop" \ -# # --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/web*desktop -# # # --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/web*desktop -# -# # libre -# # desktop-file-install --vendor="" \ -# # --remove-category="Application" \ -# # --add-category="Office" \ -# # --add-category="X-MandrivaLinux-CrossDesktop" \ -# # --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/template*desktop -# # # --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/template*desktop -# -# desktop-file-install --vendor="" \ -# --remove-category="Application" \ -# --remove-category="Database" \ -# --add-category="Office" \ -# --add-category="X-MandrivaLinux-CrossDesktop" \ -# --dir %{buildroot}%{_datadir}/applications %{buildroot}%{ooodir}/share/xdg/base*desktop - # Mandriva Rosa icons mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ tar -xjvf %{SOURCE20} --exclude Libre_Office* -C %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ @@ -3662,1729 +1190,1855 @@ sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-base_72/' %{buildroot}%{ooodir}/sha sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo-math_72/' %{buildroot}%{ooodir}/share/xdg/math.desktop sed -i 's/^Icon=.*$/Icon=mandriva-rosa-lo_72/' %{buildroot}%{ooodir}/share/xdg/startcenter.desktop -# fix permissions for stripping -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 patch -# Versionify bash_completion (ooo-wrapper.sh) -# if [ -f %{buildroot}%{_sysconfdir}/bash_completion.d/ooo-wrapper.sh ]; then -# mv %{buildroot}%{_sysconfdir}/bash_completion.d/ooo-wrapper.sh \ -# %{buildroot}%{_sysconfdir}/bash_completion.d/ooo-wrapper%{mdvsuffix} -# fi - -# Versionify bash_completion (ooffice.sh) -# if [ -f %{buildroot}%{_sysconfdir}/bash_completion.d/ooffice*.sh ]; then -# mv %{buildroot}%{_sysconfdir}/bash_completion.d/ooffice*.sh \ -# %{buildroot}%{_sysconfdir}/bash_completion.d/ooffice%{mdvsuffix} -# fi - -# dev 300 2.3 ??? -# %if %{use_mono} -# Versionify mono-ooo.pc -# mv %{buildroot}%{_libdir}/pkgconfig/mono-ooo-%{mdvsuffix}.pc \ -# %{buildroot}%{_libdir}/pkgconfig/mono-ooo%{mdvsuffix}-2.3.pc -# %endif - -# 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' \ - %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressBarColor=68,135,223' >> %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressFrameColor=112,171,229' >> %{buildroot}%{ooodir}/program/sofficerc - -#dev300 fix position and size -sed -i '/^ProgressPosition/d;/^ProgressSize/d' \ - %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressPosition=10,307' >> %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressSize=377,9' >> %{buildroot}%{ooodir}/program/sofficerc - -#libre -# remove icons we dont have these sizes yet -# rm -rf %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/* -# rm -rf %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/* - -#libre -# remove scalables icons since we dont have yet -# rm -rf %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/* - -# libre -# Fixes japanese translations on desktop files -## patch -p0 -d %{buildroot} < %{SOURCE102} - -# libre -# # templates for kde "create new" context menu -# # tar xjf %{SOURCE31} -C %{buildroot}%{_datadir} - -# copy extensions -install -d -m755 %{buildroot}%{ooodir}/extensions -cp %{_builddir}/libreoffice-%version/solver/340/unxlng*/bin/pdfimport/pdfimport.oxt %{buildroot}%{ooodir}/extensions/ -cp %{_builddir}/libreoffice-%version/solver/340/unxlng*/bin/presenter/presenter-screen.oxt %{buildroot}%{ooodir}/extensions/ -cp %{_builddir}/libreoffice-%version/solver/340/unxlng*/bin/swext/wiki-publisher.oxt %{buildroot}%{ooodir}/extensions/ -cp %{_builddir}/libreoffice-%version/solver/340/unxlng*/bin/minimizer/presentation-minimizer.oxt %{buildroot}%{ooodir}/extensions/ - -# libre -# #fixes #56439 -# sed -i 's/^Icon=.*$/Icon=ooo-calc/' %{buildroot}%{_datadir}/templates/ooo-spreadsheet.desktop -# sed -i 's/^Icon=.*$/Icon=ooo-writer/' %{buildroot}%{_datadir}/templates/ooo-text.desktop -# sed -i 's/^Icon=.*$/Icon=ooo-impress/' %{buildroot}%{_datadir}/templates/ooo-presentation.desktop -# sed -i 's/^Icon=.*$/Icon=ooo-draw/' %{buildroot}%{_datadir}/templates/ooo-drawing.desktop - -## Libre (Temporary), will better handled inside (bin/distro-install-file-lists) -## Installation fixes -## remove fix wrong manpages files, extension gz->xz -for p in common base calc writer impress draw math; do - sed -i '/^.*man.*\.gz$/d' file-lists/${p}_list.txt -done; - -## drop GTK dependency from -core -sed -i -e '/^.*libqstart_gtk%libsuffix.so$/d' file-lists/core_list.txt -sed -i -e '/^.*pluginapp.bin$/d' file-lists/core_list.txt -echo '%ooodir/%basis/program/libqstart_gtk%libsuffix.so' >>file-lists/gnome_list.txt -echo '%ooodir/%basis/program/pluginapp.bin' >>file-lists/gnome_list.txt - -## sort removing duplicates -sort -u file-lists/gnome_list.txt > file-lists/gnome_list.uniq.sorted.txt -sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt - -## oxygen should be in the style -sed -i '/^.*images_oxygen\.zip$/d' file-lists/common_list.txt -## merge en-US with common -cat file-lists/lang_en_US_list.txt >> file-lists/common_list.txt -sort -u file-lists/common_list.txt > file-lists/common_list.uniq.sorted.txt - -## extra binfilter files -sed -i '/^.*-US.res$/d' file-lists/filter-binfilter_list.txt - -# # does not package lo original desktop files (Review) -# sed -i '/^.*libreoffice-writer.desktop$/d' file-lists/writer_list.txt -# sed -i '/^.*libreoffice-calc.desktop$/d' file-lists/calc_list.txt -# sed -i '/^.*libreoffice-impress.desktop$/d' file-lists/impress_list.txt -# sed -i '/^.*libreoffice-draw.desktop$/d' file-lists/draw_list.txt -# sed -i '/^.*libreoffice-base.desktop$/d' file-lists/base_list.txt -# sed -i '/^.*libreoffice-math.desktop$/d' file-lists/math_list.txt - -%clean -rm -rf %{buildroot} - -%post common - -%{update_desktop_database} -%update_icon_cache gnome -%update_icon_cache hicolor - -# Firefox plugin -if [ $1 -gt 1 ] -then - update-alternatives --remove %{firefox_plugin} \ - %{ooodir}/program/libnpsoplugin.so +source ./Env.Host.sh +#figure out the icon version +export `grep "^PRODUCTVERSIONSHORT =" solenv/inc/productversion.mk | sed -e "s/ //g"` +export `grep "PRODUCTVERSION[ ]*=[ ]*" solenv/inc/productversion.mk | sed -e "s/ //g"` +#install +cd instsetoo_native/util +#direct install +mkdir -p $RPM_BUILD_ROOT/%{instdir} +export PKGFORMAT=installed +#don't duplicate english helpcontent about the place +unset DEFAULT_TO_ENGLISH_FOR_PACKING +if dmake openoffice_en-US; then + ok=true + break +else + echo - ---dump log start--- + cat ../unx*.pro/LibreOffice/installed/logging/en-US/log_*_en-US.log + echo - ---dump log end--- + ok=false fi -update-alternatives \ - --install %{_libdir}/mozilla/plugins/libnpsoplugin.so %{firefox_plugin} \ - %{ooodir}/program/libnpsoplugin.so 1 - -%postun common -%{clean_desktop_database} -%clean_icon_cache gnome -%clean_icon_cache hicolor - -# Firefox plugin -if [ $1 -eq 0 ] -then - update-alternatives --remove %{firefox_plugin} \ - %{ooodir}/program/libnpsoplugin.so +if [ $ok == "false" ]; then + exit 1 fi +mkdir -p $RPM_BUILD_ROOT/%{baseinstdir} +mv ../unxlng*.pro/LibreOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{baseinstdir} +chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir} +%if %{langpacks} +dmake ooolanguagepack +rm -rf ../unxlng*.pro/LibreOffice_languagepack/installed/install/log +for langpack in ../unxlng*.pro/LibreOffice_languagepack/installed/install/*; do + cp -rp $langpack/* $RPM_BUILD_ROOT/%{baseinstdir} + rm -rf $langpack +done +%endif +rm -rf $RPM_BUILD_ROOT/%{baseinstdir}/share/prereg +#give a consistent javasettingsunopkginstall.xml +$RPM_BUILD_ROOT/%{baseinstdir}/program/unopkg list --bundled || : +export WITH_LANG="en-US" +dmake sdkoo +mv ../unxlng*.pro/LibreOffice_SDK/installed/install/en-US/sdk $RPM_BUILD_ROOT/%{sdkinstdir} +cd ../../ -%post base -%{update_desktop_database} -%postun base -%{clean_desktop_database} -%post calc -%{update_desktop_database} -%postun calc -%{clean_desktop_database} -%post draw -%{update_desktop_database} -%postun draw -%{clean_desktop_database} -%post impress -%{update_desktop_database} -%postun impress -%{clean_desktop_database} -%post math -%{update_desktop_database} -%postun math -%{clean_desktop_database} -%post writer -%{update_desktop_database} -%postun writer -%{clean_desktop_database} +#configure sdk +pushd $RPM_BUILD_ROOT/%{sdkinstdir} + for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do + sed -e "s,@OO_SDK_NAME@,sdk," \ + -e "s,@OO_SDK_HOME@,%{sdkinstdir}," \ + -e "s,@OFFICE_HOME@,%{baseinstdir}," \ + -e "s,@OO_SDK_URE_HOME@,%{ureinstdir}," \ + -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ + -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ + -e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \ + -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \ + $file.in > $file + chmod 755 $file + done +#fix permissions + find examples -type f -exec chmod -x {} \; +popd -%post pdfimport -# upgrade -if [ $1 -ge 2 ];then - # removes old installed pdfimport extension - idpdfimport=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.star.PDFImport-linux.*\)/\1/p'); - if [ "z$idpdfimport" != "z" ]; then - %unopkg remove --shared $idpdfimport 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi +#ensure a template dir for each lang +pushd $RPM_BUILD_ROOT/%{baseinstdir}/share/template +for I in %{langpack_langs}; do + mkdir -p $I +done +popd -#install new pdfimport version -%unopkg add --shared %{ooodir}/extensions/pdfimport.oxt 2> /dev/null -%unopkg list --shared &> /dev/null +#Set some aliases to canonical autocorrect language files for locales with matching languages +pushd $RPM_BUILD_ROOT/%{baseinstdir}/share/autocorr +en_GB_aliases="en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT" +for lang in $en_GB_aliases; do + ln -sf acor_en-GB.dat acor_$lang.dat +done +en_US_aliases="en-PH" +for lang in $en_US_aliases; do + ln -sf acor_en-US.dat acor_$lang.dat +done +#en-ZA exists and has a good autocorrect file with two or three extras that make sense for +#neighbouring english speaking territories +en_ZA_aliases="en-NA en-ZW" +for lang in $en_ZA_aliases; do + ln -sf acor_en-ZA.dat acor_$lang.dat +done +%if %{langpacks} +af_ZA_aliases="af-NA" +for lang in $af_ZA_aliases; do + ln -sf acor_af-ZA.dat acor_$lang.dat +done +de_DE_aliases="de-AT de-BE de-CH de-LI de-LU" +for lang in $de_DE_aliases; do + ln -sf acor_de-DE.dat acor_$lang.dat +done +es_ES_aliases="es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE" +for lang in $es_ES_aliases; do + ln -sf acor_es-ES.dat acor_$lang.dat +done +fr_FR_aliases="fr-BE fr-CA fr-CH fr-LU fr-MC" +for lang in $fr_FR_aliases; do + ln -sf acor_fr-FR.dat acor_$lang.dat +done +it_IT_aliases="it-CH" +for lang in $it_IT_aliases; do + ln -sf acor_it-IT.dat acor_$lang.dat +done +nl_NL_aliases="nl-AW" +for lang in $nl_NL_aliases; do + ln -s acor_nl-NL.dat acor_$lang.dat +done +sv_SE_aliases="sv-FI" +for lang in $sv_SE_aliases; do + ln -s acor_sv-SE.dat acor_$lang.dat +done +%else +rm -f acor_[a-df-z]*.dat acor_e[su]*.dat +%endif +popd +#rhbz#484055 make these shared across multiple applications +mkdir -p $RPM_BUILD_ROOT/%{_datadir} +mv -f $RPM_BUILD_ROOT/%{baseinstdir}/share/autocorr $RPM_BUILD_ROOT/%{_datadir}/autocorr +chmod 755 $RPM_BUILD_ROOT/%{_datadir}/autocorr -#uninstall -%preun pdfimport -if [ $1 -eq 0 ];then - idpdfimport=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.star.PDFImport-linux.*\)/\1/p'); - if [ "z$idpdfimport" != "z" ]; then - %unopkg remove --shared $idpdfimport 2> /dev/null - #clean footprint cache - %unopkg list --shared &> /dev/null - fi -fi +%if %{langpacks} -%post presenter-screen -# upgrade -if [ $1 -ge 2 ];then - idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.PresenterScreen-linux.*\)/\1/p'); - if [ "z$idextension" != "z" ]; then - %unopkg remove --shared $idextension 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi -#install -%unopkg add --shared %{ooodir}/extensions/presenter-screen.oxt 2> /dev/null -%unopkg list --shared &> /dev/null +#auto generate the langpack file lists, format is... +#langpack id, has help or not, autocorrection glob, script classification +langpackdetails=\ +(\ +af nohelp western ar nohelp ctl \ +as nohelp western bg help western \ +bn help western ca help western \ +cs help western cy nohelp western \ +da help western de help western \ +dz help ctl el help western \ +es help western et help western \ +eu help western fi help western \ +fr help western ga nohelp western \ +gl help western gu nohelp ctl \ +he nohelp ctl hi help ctl \ +hr nohelp western hu help western \ +it help western ja help cjk \ +ko help cjk kn nohelp western \ +lt nohelp western mai nohelp western \ +ml nohelp western mr nohelp western \ +nb help western nl help western \ +nn help western nr nohelp western \ +nso nohelp western or nohelp ctl \ +pa-IN nohelp ctl pl help western \ +pt help western pt-BR help western \ +ro nohelp western ru help western \ +sh nohelp western si help ctl \ +sk help western sl help western \ +sr nohelp western ss nohelp western \ +st nohelp western sv help western \ +ta nohelp ctl te nohelp western \ +th nohelp ctlseqcheck tn nohelp western \ +tr help western ts nohelp western \ +uk help western ve nohelp western \ +xh nohelp western zh-CN help cjk \ +zh-TW help cjk zu i nohelp western \ +fa nohelp ctl br help western \ +lv nohelp western \ +) +tar xzf %{SOURCE5} -%preun presenter-screen -if [ $1 -eq 0 ];then - idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.PresenterScreen-linux.*\)/\1/p'); - if [ "z$idextension" != "z" ]; then - %unopkg remove --shared $idextension 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi +i=0 +while [ $i -lt ${#langpackdetails[@]} ]; do + lang=${langpackdetails[$i]} + sed -e "s/LANG/$lang/g" langpacks/libreoffice.langpack-common.template > $lang.filelist + echo "$lang.filelist" + i=$[i+1] + help=${langpackdetails[$i]} + if [ "$help" = "help" ]; then + sed -e "s/LANG/$lang/g" langpacks/libreoffice.langpack-help.template >> $lang.help.filelist + echo "$lang.help.filelist" + cat $lang.help.filelist + fi + i=$[i+1] + type=${langpackdetails[$i]} + if [ "$type" = "cjk" ]; then + sed -e "s/LANG/$lang/g" langpacks/libreoffice.langpack-cjk.template >> $lang.filelist + fi + #rh217269 upstream made a decision to sequence check all ctl languages + #I think this is wrong, and only Thai should be sequence checked + if [ "$type" = "ctlseqcheck" ]; then + sed -e "s/LANG/$lang/g" langpacks/libreoffice.langpack-ctl.template >> $lang.filelist + fi + if [ "$type" = "ctl" ]; then + rm -f $RPM_BUILD_ROOT/%{baseinstdir}/share/registry/ctl_$lang.xcd + fi + i=$[i+1] +done -# %post report-builder -# upgrade -# if [ $1 -ge 1 ];then -# idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.reportdesigner\)/\1/p'); -# if [ "z$idextension" != "z" ]; then -# %unopkg remove --shared $idextension 2> /dev/null -# %unopkg list --shared &> /dev/null -# fi -# fi -#install -# %unopkg add --shared %{ooodir}/sun-report-builder.oxt 2> /dev/null -# %unopkg list --shared &> /dev/null +#rhbz#452379 clump serbian translations together +cat sh.filelist >> sr.filelist -#uninstall -# %preun report-builder -# if [ $1 -eq 0 ];then -# idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.reportdesigner\)/\1/p'); -# if [ "z$idextension" != "z" ]; then -# %unopkg remove --shared $idextension 2> /dev/null -# %unopkg list --shared &> /dev/null -# fi -# fi +%endif -%post wiki-publisher -# upgrade -if [ $1 -ge 2 ];then - idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.wiki-publisher\)/\1/p'); - if [ "z$idextension" != "z" ]; then - %unopkg remove --shared $idextension 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi -#install -%unopkg add --shared %{ooodir}/extensions/wiki-publisher.oxt 2> /dev/null -%unopkg list --shared &> /dev/null +#remove it in case we didn't build with gcj +rm -f %{buildroot}/%{baseinstdir}/program/classes/sandbox.jar -%preun wiki-publisher -if [ $1 -eq 0 ];then - idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.wiki-publisher\)/\1/p'); - if [ "z$idextension" != "z" ]; then - %unopkg remove --shared $idextension 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi +#remove dummy .dat files +rm -f %{buildroot}/%{baseinstdir}/program/root?.dat -%post presentation-minimizer -# upgrade -if [ $1 -ge 2 ];then - idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.star.PresentationMinimizer-linux.*\)/\1/p'); - if [ "z$idextension" != "z" ]; then - %unopkg remove --shared $idextension 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi -#install -%unopkg add --shared %{ooodir}/extensions/sun-presentation-minimizer.oxt 2> /dev/null -%unopkg list --shared &> /dev/null +#set standard permissions for rpmlint +find %{buildroot}/%{baseinstdir} -exec chmod +w {} \; +find %{buildroot}/%{baseinstdir} -type d -exec chmod 0755 {} \; -%preun presentation-minimizer -if [ $1 -eq 0 ];then - idextension=$(%unopkg list --shared 2> /dev/null | sed -ne 's/^Identifier: \(com.sun.star.PresentationMinimizer-linux.*\)/\1/p'); - if [ "z$idextension" != "z" ]; then - %unopkg remove --shared $idextension 2> /dev/null - %unopkg list --shared &> /dev/null - fi -fi +# move python bits into site-packages +mkdir -p %{buildroot}/%{python_sitearch} +pushd %{buildroot}/%{python_sitearch} +echo "import sys, os" > uno.py +echo "sys.path.append('%{baseinstdir}/program')" >> uno.py +echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{baseinstdir}/program/fundamentalrc')" >> uno.py +cat %{buildroot}/%{baseinstdir}/program/uno.py >> uno.py +rm -f %{buildroot}/%{baseinstdir}/program/uno.py* +mv -f %{buildroot}/%{baseinstdir}/program/unohelper.py* . +popd + +# rhbz#477435 package opensymbol separately +pushd %{buildroot}/%{baseinstdir}/share/fonts/truetype +install -d -m 0755 %{buildroot}%{_fontdir} +install -p -m 0644 *.ttf %{buildroot}%{_fontdir} +popd +rm -rf %{buildroot}/%{baseinstdir}/share/fonts + +#ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs +#have snuck through +pic=0 +executable=0 +for foo in `find %{buildroot}/%{instdir} -name "*" -exec file {} \;| grep ": ELF" | cut -d: -f 1` ; do + chmod +wx $foo + ls -asl $foo + result=`readelf -d $foo | grep TEXTREL` || true + if [ "$result" != "" ]; then + echo "TEXTREL Warning: $foo is b0rked (-fpic missing)" + pic=1 + fi + result=`readelf -l $foo | grep GNU_STACK | grep RWE` || true + if [ "$result" != "" ]; then + echo "GNU_STACK Warning: $foo is b0rked (-noexecstack missing)" + executable=1 + fi +done +if [ $pic == 1 ]; then false; fi +if [ $executable == 1 ]; then false; fi + +#make up some /usr/bin scripts +mkdir -p %{buildroot}/%{_bindir} + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/ooffice +echo exec libreoffice \"\$@\" >> %{buildroot}/%{_bindir}/ooffice +chmod a+x %{buildroot}/%{_bindir}/ooffice + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/ooviewdoc +echo exec libreoffice --view \"\$@\" >> %{buildroot}/%{_bindir}/ooviewdoc +chmod a+x %{buildroot}/%{_bindir}/ooviewdoc + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/oowriter +echo exec libreoffice --writer \"\$@\" >> %{buildroot}/%{_bindir}/oowriter +chmod a+x %{buildroot}/%{_bindir}/oowriter + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/oocalc +echo exec libreoffice --calc \"\$@\" >> %{buildroot}/%{_bindir}/oocalc +chmod a+x %{buildroot}/%{_bindir}/oocalc + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/ooimpress +echo exec libreoffice --impress \"\$@\" >> %{buildroot}/%{_bindir}/ooimpress +chmod a+x %{buildroot}/%{_bindir}/ooimpress + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/oodraw +echo exec libreoffice --draw \"\$@\" >> %{buildroot}/%{_bindir}/oodraw +chmod a+x %{buildroot}/%{_bindir}/oodraw + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/oomath +echo exec libreoffice --math \"\$@\" >> %{buildroot}/%{_bindir}/oomath +chmod a+x %{buildroot}/%{_bindir}/oomath + +echo \#\!/bin/sh > %{buildroot}/%{_bindir}/oobase +echo exec libreoffice --base \"\$@\" >> %{buildroot}/%{_bindir}/oobase +chmod a+x %{buildroot}/%{_bindir}/oobase + +cp -f %{SOURCE6} %{buildroot}/%{_bindir}/unopkg +sed -i -e "s/LAUNCHER/unopkg/g" %{buildroot}/%{_bindir}/unopkg +sed -i -e "s/BRAND/libreoffice/g" %{buildroot}/%{_bindir}/unopkg +chmod a+x %{buildroot}/%{_bindir}/unopkg + +cp -f %{SOURCE6} %{buildroot}/%{_bindir}/libreoffice +sed -i -e "s/LAUNCHER/soffice/g" %{buildroot}/%{_bindir}/libreoffice +sed -i -e "s/BRAND/libreoffice/g" %{buildroot}/%{_bindir}/libreoffice +chmod a+x %{buildroot}/%{_bindir}/libreoffice + +pushd %{buildroot}/%{_bindir} +# rhbz#499474 provide a /usr/bin/soffice for .recently-used.xbel +ln -s %{baseinstdir}/program/soffice soffice +# rhbz#499474 provide a /usr/bin/openoffice.org for backwards compat +ln -s libreoffice openoffice.org +popd + +pushd %{buildroot}/%{baseinstdir}/share/xdg/ +chmod u+w *.desktop +rm -rf printeradmin.desktop +ICONVERSION=`echo $PRODUCTVERSION | sed -e 's/\.//'` +for file in *.desktop; do + # rhbz#156677 remove the version from Name= + # rhbz#156067 don't version the icons + sed -i -e "s/ *$PRODUCTVERSION//g" \ + -e "s/$ICONVERSION//g" \ + -e "s/$PRODUCTVERSIONSHORT//g" \ + $file + # add X-GIO-NoFuse so we get url:// instead of file://~.gvfs/ + echo X-GIO-NoFuse=true >> $file +done +for app in base calc draw impress math writer; do + echo "StartupNotify=true" >> $app.desktop + echo "TryExec=oo$app" >> $app.desktop +done + +# rhbz#156677# / rhbz#186515# +echo "NoDisplay=true" >> startcenter.desktop +# rhbz#491159 temporarily remove NoDisplay=true from qstart.desktop +sed -i -e "/NoDisplay=true/d" qstart.desktop +# relocate the .desktop and icon files +mkdir -p %{buildroot}/%{_datadir}/applications +for app in base %{?with_binfilter:binfilter} calc draw impress javafilter math startcenter writer; do + desktop-file-validate $app.desktop + cp -p $app.desktop %{buildroot}/%{_datadir}/applications/libreoffice-$app.desktop +done +popd + +# desktop files +%if 0 +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --add-mime-type="application/vnd.ms-works;application/x-msworks-wp;zz-application/zz-winassoc-wps" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/writer*desktop + +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/calc*desktop + +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --remove-category="Graphics" \ + --remove-category="VectorGraphics" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/draw*desktop + +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/impress*desktop + +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/math*desktop + +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --remove-category="Network" \ + --remove-category="WebDevelopment" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/web*desktop + +desktop-file-install --vendor="" \ + --remove-category="Application" \ + --add-category="Office" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/template*desktop +%endif + +desktop-file-install --vendor="" \ + --remove-category="X-MandrivaLinux-MoreApplications-Databases" \ + --add-category="X-MandrivaLinux-CrossDesktop" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/libreoffice-base.desktop + +%if 0 +## MS OOXML (#36465) +desktop-file-install \ + --add-mime-type="application/vnd.openxmlformats-officedocument.wordprocessingml.document" \ + --add-mime-type="application/vnd.ms-word.document.macroEnabled.12" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/writer*desktop + +desktop-file-install \ + --add-mime-type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" \ + --add-mime-type="application/vnd.ms-excel.sheet.macroEnabled.12" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/calc*desktop + +desktop-file-install \ + --add-mime-type="application/vnd.openxmlformats-officedocument.presentationml.presentation" \ + --add-mime-type="application/vnd.ms-powerpoint.presentation.macroEnabled.12" \ + --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/impress*desktop +%endif + +for app in base calc draw impress math writer startcenter; do + sed -i -e "s/Icon=libreoffice-/Icon=libreoffice3.5-/g" %{buildroot}%_datadir/applications/%name-${app}.desktop +done + +pushd sysui/output/usr/share/ +#get rid of the gnome icons and other unneeded files +rm -rf icons/gnome applications application-registry + +#relocate the rest of them +for icon in `find icons -type f`; do + mkdir -p %{buildroot}/%{_datadir}/`dirname $icon` + cp -p $icon %{buildroot}/%{_datadir}/`echo $icon | sed -e s@office$ICONVERSION@office@` +done + +mkdir -p %{buildroot}/%{_datadir}/mime-info +cp -p mime-info/libreoffice$PRODUCTVERSION.keys %{buildroot}/%{_datadir}/mime-info/libreoffice.keys +cp -p mime-info/libreoffice$PRODUCTVERSION.mime %{buildroot}/%{_datadir}/mime-info/libreoffice.mime +#add our mime-types, e.g. for .oxt extensions +mkdir -p %{buildroot}/%{_datadir}/mime/packages +cp -p mime/packages/libreoffice$PRODUCTVERSION.xml %{buildroot}/%{_datadir}/mime/packages/libreoffice.xml +popd + +rm -rf %{buildroot}/%{baseinstdir}/readmes +rm -rf %{buildroot}/%{baseinstdir}/licenses + +mkdir -p %{buildroot}/%{baseinstdir}/share/psprint/driver +cp -p psprint_config/configuration/ppds/SGENPRT.PS %{buildroot}/%{baseinstdir}/share/psprint/driver/SGENPRT.PS + +# rhbz#452385 to auto have postgres in classpath if subsequently installed +# rhbz#465664 to get lucene working for functional help +sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/lucene.jar file:///usr/share/java/lucene-contrib/lucene-analyzers.jar file:///usr/share/java/postgresql-jdbc.jar#" %{buildroot}/%{baseinstdir}/program/fundamentalrc + +# Br translation doesn't have any template so this lead to a crash. +# Better use fr ones for now ( and check if this is still valid for next update ) +# FIXME: Re enable when we will add back br translations +#pushd %buildroot%basisinstdir/share/template/ +#rm -fr br +#ln -s fr br +#popd + +export DESTDIR=%{buildroot} +install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinstdir} -p %{_datadir}/libreoffice/gdb + +%check +source ./Env.Host.sh +cd smoketestoo_native +unset WITH_LANG +#JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" works around flawed accessibility check +#SAL_USE_VCLPLUGIN="svp" uses the headless plugin for these tests +JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" SAL_USE_VCLPLUGIN="svp" timeout -k 2m 2h build.pl %files -%files base -f file-lists/base_list.txt -%defattr(-,root,root,-) -%{_mandir}/man1/lobase* -# %{_datadir}/applications/base.desktop -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg +%files core +%dir %{baseinstdir} +%dir %{baseinstdir}/help +%docdir %{baseinstdir}/help/en +%dir %{baseinstdir}/help/en +%{baseinstdir}/help/en/default.css +%{baseinstdir}/help/en/err.html +%{baseinstdir}/help/en/highcontrast1.css +%{baseinstdir}/help/en/highcontrast2.css +%{baseinstdir}/help/en/highcontrastblack.css +%{baseinstdir}/help/en/highcontrastwhite.css +%{baseinstdir}/help/en/sbasic.* +%{baseinstdir}/help/en/schart.* +%{baseinstdir}/help/en/shared.* +%{baseinstdir}/help/idxcaption.xsl +%{baseinstdir}/help/idxcontent.xsl +%{baseinstdir}/help/main_transform.xsl +%{baseinstdir}/presets +%dir %{baseinstdir}/program +%{baseinstdir}/program/addin +%{baseinstdir}/program/basprov.uno.so +%{baseinstdir}/program/canvasfactory.uno.so +%{baseinstdir}/program/cde-open-url +%dir %{baseinstdir}/program/classes +%{baseinstdir}/program/classes/agenda.jar +%{baseinstdir}/program/classes/commonwizards.jar +%{baseinstdir}/program/classes/fax.jar +%{baseinstdir}/program/classes/form.jar +%{baseinstdir}/program/classes/query.jar +%{baseinstdir}/program/classes/letter.jar +%{baseinstdir}/program/classes/LuceneHelpWrapper.jar +%{baseinstdir}/program/classes/officebean.jar +%{baseinstdir}/program/classes/report.jar +%{baseinstdir}/program/classes/saxon9.jar +%{baseinstdir}/program/classes/ScriptFramework.jar +%{baseinstdir}/program/classes/ScriptProviderForJava.jar +%{baseinstdir}/program/classes/table.jar +%{baseinstdir}/program/classes/unoil.jar +%{baseinstdir}/program/classes/web.jar +%{baseinstdir}/program/classes/XMergeBridge.jar +%{baseinstdir}/program/classes/xmerge.jar +%{baseinstdir}/program/classes/XSLTFilter.jar +%{baseinstdir}/program/classes/XSLTValidate.jar +%{baseinstdir}/program/cmdmail.uno.so +%{baseinstdir}/program/libdeployment.so +%{baseinstdir}/program/libdeploymentgui.so +%{baseinstdir}/program/dlgprov.uno.so +%{baseinstdir}/program/expwrap.uno.so +%{baseinstdir}/program/fastsax.uno.so +%{baseinstdir}/program/fpicker.uno.so +%{baseinstdir}/program/fps_office.uno.so +%{baseinstdir}/program/gnome-open-url +%{baseinstdir}/program/gnome-open-url.bin +%{baseinstdir}/program/gengal +%{baseinstdir}/program/gengal.bin +%{baseinstdir}/program/hatchwindowfactory.uno.so +%{baseinstdir}/program/i18nsearch.uno.so +%{baseinstdir}/program/libacclo.so +%{baseinstdir}/program/libavmedia*.so +%{baseinstdir}/program/libbasctllo.so +%{baseinstdir}/program/libbiblo.so +%{baseinstdir}/program/libcached1.so +%{baseinstdir}/program/libcanvastoolslo.so +%{baseinstdir}/program/libchart*lo.so +%{baseinstdir}/program/libcollator_data.so +%{baseinstdir}/program/libcppcanvaslo.so +%{baseinstdir}/program/libctllo.so +%{baseinstdir}/program/libcuilo.so +%{baseinstdir}/program/libdbalo.so +%{baseinstdir}/program/libdbaselo.so +%{baseinstdir}/program/libdbaxmllo.so +%{baseinstdir}/program/libdbmmlo.so +%{baseinstdir}/program/libdbpool2.so +%{baseinstdir}/program/libdbtoolslo.so +%{baseinstdir}/program/libdbulo.so +%{baseinstdir}/program/libdeploymentmisclo.so +%{baseinstdir}/program/libdesktop_detectorlo.so +%{baseinstdir}/program/libdict_ja.so +%{baseinstdir}/program/libdict_zh.so +%{baseinstdir}/program/libdrawinglayerlo.so +%{baseinstdir}/program/libeditenglo.so +%{baseinstdir}/program/libembobj.so +%{baseinstdir}/program/libemboleobj.so +%{baseinstdir}/program/libevoab*.so +%{baseinstdir}/program/libevtattlo.so +%{baseinstdir}/program/libegilo.so +%{baseinstdir}/program/libemelo.so +%{baseinstdir}/program/libepblo.so +%{baseinstdir}/program/libepglo.so +%{baseinstdir}/program/libepplo.so +%{baseinstdir}/program/libepslo.so +%{baseinstdir}/program/libeptlo.so +%{baseinstdir}/program/liberalo.so +%{baseinstdir}/program/libetilo.so +%{baseinstdir}/program/libexplo.so +%{baseinstdir}/program/libicdlo.so +%{baseinstdir}/program/libicglo.so +%{baseinstdir}/program/libidxlo.so +%{baseinstdir}/program/libimelo.so +%{baseinstdir}/program/libindex_data.so +%{baseinstdir}/program/libipblo.so +%{baseinstdir}/program/libipdlo.so +%{baseinstdir}/program/libipslo.so +%{baseinstdir}/program/libiptlo.so +%{baseinstdir}/program/libipxlo.so +%{baseinstdir}/program/libiralo.so +%{baseinstdir}/program/libitglo.so +%{baseinstdir}/program/libitilo.so +%{baseinstdir}/program/liboooimprovecorelo.so +%{baseinstdir}/program/libfilelo.so +%{baseinstdir}/program/libfilterconfiglo.so +%{baseinstdir}/program/libflatlo.so +%{baseinstdir}/program/libfrmlo.so +%{baseinstdir}/program/libguesslanglo.so +%{baseinstdir}/program/libhelplinkerlo.so +%{baseinstdir}/program/libhyphenlo.so +%{baseinstdir}/program/libi18nregexplo.so +%{baseinstdir}/program/libjdbclo.so +%{baseinstdir}/program/liblnglo.so +%{baseinstdir}/program/libloglo.so +%{baseinstdir}/program/liblocaledata_en.so +%{baseinstdir}/program/liblocaledata_es.so +%{baseinstdir}/program/liblocaledata_euro.so +%{baseinstdir}/program/liblocaledata_others.so +%{baseinstdir}/program/libmcnttype.so +%{baseinstdir}/program/libmozbootstrap.so +%{baseinstdir}/program/libmsfilterlo.so +%{baseinstdir}/program/mtfrenderer.uno.so +%{baseinstdir}/program/libmysqllo.so +%{baseinstdir}/program/libodbclo.so +%{baseinstdir}/program/libodbcbaselo.so +%{baseinstdir}/program/liboffacclo.so +%{baseinstdir}/program/libooxlo.so +%{baseinstdir}/program/libpcrlo.so +%{baseinstdir}/program/libpdffilterlo.so +%{baseinstdir}/program/libpllo.so +%{baseinstdir}/program/libprotocolhandlerlo.so +%{baseinstdir}/program/libqstart_gtklo.so +%{baseinstdir}/program/librecentfile.so +%{baseinstdir}/program/libreslo.so +%{baseinstdir}/program/libsaxlo.so +%{baseinstdir}/program/libscnlo.so +%{baseinstdir}/program/libscriptframe.so +%{baseinstdir}/program/libsdlo.so +%{baseinstdir}/program/libsdfiltlo.so +%{baseinstdir}/program/libsdbc2.so +%{baseinstdir}/program/libsdbtlo.so +%{baseinstdir}/program/libsddlo.so +%{baseinstdir}/program/libsduilo.so +%{baseinstdir}/program/libspalo.so +%{baseinstdir}/program/libspelllo.so +%{baseinstdir}/program/libsrtrs1.so +%{baseinstdir}/program/libsvxlo.so +%{baseinstdir}/program/libsvxcorelo.so +%{baseinstdir}/program/libswlo.so +%{baseinstdir}/program/libtextconv_dict.so +%{baseinstdir}/program/libtextconversiondlgslo.so +%{baseinstdir}/program/libtvhlp1.so +%{baseinstdir}/program/libodfflatxmllo.so +%{baseinstdir}/program/libucbhelper4gcc3.so +%{baseinstdir}/program/libucpchelp1.so +%{baseinstdir}/program/libucpdav1.so +%{baseinstdir}/program/libucpftp1.so +%{baseinstdir}/program/libucphier1.so +%{baseinstdir}/program/libucppkg1.so +%{baseinstdir}/program/libunordflo.so +%{baseinstdir}/program/libunopkgapp.so +%{baseinstdir}/program/libunoxmllo.so +%{baseinstdir}/program/libupdchklo.so +%{baseinstdir}/program/libuuilo.so +%{baseinstdir}/program/libvbahelperlo.so +%{baseinstdir}/program/libvclplug_genlo.so +%{baseinstdir}/program/libvclplug_gtklo.so +%{baseinstdir}/program/libwpgimportlo.so +%{baseinstdir}/program/libxmlfalo.so +%{baseinstdir}/program/libxmlfdlo.so +%{baseinstdir}/program/libxmxlo.so +%{baseinstdir}/program/libxoflo.so +%{baseinstdir}/program/libxsec_fw.so +%{baseinstdir}/program/libxsec_xmlsec.so +%{baseinstdir}/program/libxsltdlglo.so +%{baseinstdir}/program/libxsltfilterlo.so +%{baseinstdir}/program/libxstor.so +%{baseinstdir}/program/migrationoo2.uno.so +%{baseinstdir}/program/migrationoo3.uno.so +%{baseinstdir}/program/msforms.uno.so +%{baseinstdir}/program/nsplugin +%{baseinstdir}/program/open-url +%{baseinstdir}/program/types/offapi.rdb +%{baseinstdir}/program/passwordcontainer.uno.so +%{baseinstdir}/program/pagein-common +%{baseinstdir}/program/plugin +%{baseinstdir}/program/pluginapp.bin +%dir %{baseinstdir}/program/resource +%{baseinstdir}/program/resource/avmediaen-US.res +%{baseinstdir}/program/resource/accen-US.res +%{baseinstdir}/program/resource/basctlen-US.res +%{baseinstdir}/program/resource/biben-US.res +%{baseinstdir}/program/resource/calen-US.res +%{baseinstdir}/program/resource/chartcontrolleren-US.res +%{baseinstdir}/program/resource/cuien-US.res +%{baseinstdir}/program/resource/dbaen-US.res +%{baseinstdir}/program/resource/dbmmen-US.res +%{baseinstdir}/program/resource/dbuen-US.res +%{baseinstdir}/program/resource/dbwen-US.res +%{baseinstdir}/program/resource/deploymenten-US.res +%{baseinstdir}/program/resource/deploymentguien-US.res +%{baseinstdir}/program/resource/dkten-US.res +%{baseinstdir}/program/resource/editengen-US.res +%{baseinstdir}/program/resource/epsen-US.res +%{baseinstdir}/program/resource/euren-US.res +%{baseinstdir}/program/resource/fps_officeen-US.res +%{baseinstdir}/program/resource/frmen-US.res +%{baseinstdir}/program/resource/fween-US.res +%{baseinstdir}/program/resource/galen-US.res +%{baseinstdir}/program/resource/impen-US.res +%{baseinstdir}/program/resource/ofaen-US.res +%{baseinstdir}/program/resource/pcren-US.res +%{baseinstdir}/program/resource/pdffilteren-US.res +%{baseinstdir}/program/resource/sanen-US.res +%{baseinstdir}/program/resource/sben-US.res +%{baseinstdir}/program/resource/sden-US.res +%{baseinstdir}/program/resource/sfxen-US.res +%{baseinstdir}/program/resource/spaen-US.res +%{baseinstdir}/program/resource/sdbten-US.res +%{baseinstdir}/program/resource/svlen-US.res +%{baseinstdir}/program/resource/svten-US.res +%{baseinstdir}/program/resource/svxen-US.res +%{baseinstdir}/program/resource/swen-US.res +%{baseinstdir}/program/resource/textconversiondlgsen-US.res +%{baseinstdir}/program/resource/tken-US.res +%{baseinstdir}/program/resource/tplen-US.res +%{baseinstdir}/program/resource/uuien-US.res +%{baseinstdir}/program/resource/updchken-US.res +%{baseinstdir}/program/resource/upden-US.res +%{baseinstdir}/program/resource/vclen-US.res +%{baseinstdir}/program/resource/wzien-US.res +%{baseinstdir}/program/resource/xmlsecen-US.res +%{baseinstdir}/program/resource/xsltdlgen-US.res +%{baseinstdir}/program/senddoc +%{baseinstdir}/program/services/services.rdb +%{baseinstdir}/program/simplecanvas.uno.so +%{baseinstdir}/program/slideshow.uno.so +%{baseinstdir}/program/libsofficeapp.so +%{baseinstdir}/program/spadmin.bin +%{baseinstdir}/program/stringresource.uno.so +%{baseinstdir}/program/syssh.uno.so +%{baseinstdir}/program/ucpcmis1.uno.so +%{baseinstdir}/program/ucpexpand1.uno.so +%{baseinstdir}/program/ucpext.uno.so +%{baseinstdir}/program/ucptdoc1.uno.so +%{baseinstdir}/program/unorc +%{baseinstdir}/program/updatefeed.uno.so +%{baseinstdir}/ure-link +%{baseinstdir}/program/uri-encode +%{baseinstdir}/program/vbaevents.uno.so +%{baseinstdir}/program/vclcanvas.uno.so +%{baseinstdir}/program/versionrc +%{baseinstdir}/program/cairocanvas.uno.so +%dir %{baseinstdir}/share +%dir %{baseinstdir}/share/Scripts +%{baseinstdir}/share/Scripts/java +%{baseinstdir}/share/autotext +%{baseinstdir}/share/basic +%dir %{baseinstdir}/share/config +%{baseinstdir}/share/config/images.zip +%{baseinstdir}/share/config/images_crystal.zip +%{baseinstdir}/share/config/images_hicontrast.zip +%{baseinstdir}/share/config/images_oxygen.zip +%{baseinstdir}/share/config/images_tango.zip +%{baseinstdir}/share/config/javasettingsunopkginstall.xml +%{baseinstdir}/share/config/psetup.xpm +%{baseinstdir}/share/config/psetupl.xpm +%dir %{baseinstdir}/share/config/soffice.cfg +%{baseinstdir}/share/config/soffice.cfg/modules +%{baseinstdir}/share/config/symbol +%{baseinstdir}/share/config/webcast +%{baseinstdir}/share/config/wizard +%dir %{baseinstdir}/share/dtd +%{baseinstdir}/share/dtd/officedocument +%{baseinstdir}/share/gallery +%dir %{baseinstdir}/share/psprint +%config %{baseinstdir}/share/psprint/psprint.conf +%{baseinstdir}/share/psprint/driver +%dir %{baseinstdir}/share/registry +%{baseinstdir}/share/registry/gnome.xcd +%{baseinstdir}/share/registry/lingucomponent.xcd +%{baseinstdir}/share/registry/main.xcd +%{baseinstdir}/share/registry/oo-ad-ldap.xcd.sample +%{baseinstdir}/share/registry/oo-ldap.xcd.sample +%{baseinstdir}/share/registry/Langpack-en-US.xcd +%dir %{baseinstdir}/share/registry/res +%{baseinstdir}/share/registry/res/fcfg_langpack_en-US.xcd +%dir %{baseinstdir}/share/samples +%{baseinstdir}/share/samples/en-US +%dir %{baseinstdir}/share/template +%{baseinstdir}/share/template/en-US +%dir %{baseinstdir}/share/template/common +%{baseinstdir}/share/template/common/layout +%{baseinstdir}/share/template/wizard +%dir %{baseinstdir}/share/wordbook +%{baseinstdir}/share/wordbook/en-GB.dic +%{baseinstdir}/share/wordbook/en-US.dic +%{baseinstdir}/share/wordbook/sl.dic +%{baseinstdir}/share/wordbook/technical.dic +%dir %{baseinstdir}/share/xslt +%{baseinstdir}/share/xslt/common +%dir %{baseinstdir}/share/xslt/export +%{baseinstdir}/share/xslt/export/common +%{baseinstdir}/share/xslt/export/spreadsheetml +%{baseinstdir}/share/xslt/export/wordml +%dir %{baseinstdir}/share/xslt/import +%{baseinstdir}/share/xslt/import/common +%{baseinstdir}/share/xslt/import/spreadsheetml +%{baseinstdir}/share/xslt/import/wordml +%{baseinstdir}/program/liblnthlo.so +%{_bindir}/unopkg +#icons and mime +%{_datadir}/icons/*/*/*/libreoffice* +%{_datadir}/mime-info/libreoffice.* +%{baseinstdir}/program/libxmlsecurity.so +%{_datadir}/mime/packages/libreoffice.xml +%{baseinstdir}/program/configmgr.uno.so +%{baseinstdir}/program/desktopbe1.uno.so +%{baseinstdir}/program/fsstorage.uno.so +%{baseinstdir}/program/gconfbe1.uno.so +%{baseinstdir}/program/i18npool.uno.so +%{baseinstdir}/program/libbasegfxlo.so +%{baseinstdir}/program/libcomphelpgcc3.so +%{baseinstdir}/program/libfileacc.so +%{baseinstdir}/program/libfwelo.so +%{baseinstdir}/program/libfwilo.so +%{baseinstdir}/program/libfwklo.so +%{baseinstdir}/program/libfwllo.so +%{baseinstdir}/program/libfwmlo.so +%{baseinstdir}/program/libi18nisolang*.so +%{baseinstdir}/program/libi18npaper*.so +%{baseinstdir}/program/libi18nutilgcc3.so +%{baseinstdir}/program/libpackage2.so +%{baseinstdir}/program/libsblo.so +%{baseinstdir}/program/libsfxlo.so +%{baseinstdir}/program/libsotlo.so +%{baseinstdir}/program/libspllo.so +%{baseinstdir}/program/libspl_unxlo.so +%{baseinstdir}/program/libsvllo.so +%{baseinstdir}/program/libsvtlo.so +%{baseinstdir}/program/libtklo.so +%{baseinstdir}/program/libtllo.so +%{baseinstdir}/program/libucb1.so +%{baseinstdir}/program/libucpfile1.so +%{baseinstdir}/program/libutllo.so +%{baseinstdir}/program/libvcllo.so +%{baseinstdir}/program/libxcrlo.so +%{baseinstdir}/program/libxolo.so +%{baseinstdir}/program/localebe1.uno.so +%{baseinstdir}/program/ucpgio1.uno.so +%{baseinstdir}/program/types/oovbaapi.rdb +#share unopkg +%dir %{baseinstdir}/share/extensions +%{baseinstdir}/share/extensions/package.txt +%{baseinstdir}/program/unopkg +%{baseinstdir}/program/unopkg.bin +%{baseinstdir}/program/bootstraprc +%{baseinstdir}/program/fundamentalrc +%{baseinstdir}/program/setuprc +%doc %{baseinstdir}/CREDITS.odt +%doc %{baseinstdir}/LICENSE +%doc %{baseinstdir}/LICENSE.odt +%doc %{baseinstdir}/THIRDPARTYLICENSEREADME.html +%{baseinstdir}/program/about.* +%{baseinstdir}/program/intro.* +%{baseinstdir}/program/soffice +%{baseinstdir}/program/soffice.bin +%{baseinstdir}/program/sofficerc +%{baseinstdir}/program/spadmin +%{baseinstdir}/program/unoinfo +%{baseinstdir}/program/libnpsoplugin.so +%{baseinstdir}/program/oosplash +%{baseinstdir}/program/shell/ +%{baseinstdir}/share/config/images_brand.zip +%{baseinstdir}/share/xdg/ +%{baseinstdir}/program/redirectrc +%{ureinstdir}/lib/libjvm*.so* +%{_datadir}/applications/libreoffice-startcenter.desktop +#launchers +%{_bindir}/libreoffice +%{_bindir}/openoffice.org +%{_bindir}/soffice +%{_bindir}/ooffice +%{_bindir}/ooviewdoc -%files calc -f file-lists/calc_list.txt -%defattr(-,root,root,-) -#libre -# %{_datadir}/templates/ooo-spreadsheet.desktop -# %{_datadir}/templates/.source/ooo-spreadsheet.ods -%{_mandir}/man1/localc* -# %{_datadir}/applications/calc.desktop -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg +# Exclude files that are already in libreoffice-java-common +%exclude %{baseinstdir}/program/classes/agenda.jar +%exclude %{baseinstdir}/program/classes/commonwizards.jar +%exclude %{baseinstdir}/program/classes/fax.jar +%exclude %{baseinstdir}/program/classes/form.jar +%exclude %{baseinstdir}/program/classes/query.jar +%exclude %{baseinstdir}/program/classes/letter.jar +%exclude %{baseinstdir}/program/classes/LuceneHelpWrapper.jar +%exclude %{baseinstdir}/program/classes/officebean.jar +%exclude %{baseinstdir}/program/classes/report.jar +%exclude %{baseinstdir}/program/classes/saxon9.jar +%exclude %{baseinstdir}/program/classes/ScriptFramework.jar +%exclude %{baseinstdir}/program/classes/ScriptProviderForJava.jar +%exclude %{baseinstdir}/program/classes/table.jar +%exclude %{baseinstdir}/program/classes/unoil.jar +%exclude %{baseinstdir}/program/classes/web.jar +%exclude %{baseinstdir}/program/classes/XMergeBridge.jar +%exclude %{baseinstdir}/program/classes/xmerge.jar +%exclude %{baseinstdir}/program/classes/XSLTFilter.jar +%exclude %{baseinstdir}/program/classes/XSLTValidate.jar +%exclude %{baseinstdir}/program/libofficebean.so +%exclude %{baseinstdir}/share/Scripts/java -%files common -f file-lists/common_list.uniq.sorted.txt -%defattr(-,root,root,-) -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo_72.svg +%files base +%dir %{baseinstdir} +%{baseinstdir}/help/en/sdatabase.* +%dir %{baseinstdir}/program +%dir %{baseinstdir}/program/classes +%{baseinstdir}/program/classes/hsqldb.jar +%{baseinstdir}/program/classes/sdbc_hsqldb.jar +%{baseinstdir}/program/libabplo.so +%{baseinstdir}/program/libadabasuilo.so +%{baseinstdir}/program/libdbplo.so +%{baseinstdir}/program/libhsqldb.so +%{baseinstdir}/program/librpt*lo.so +%dir %{baseinstdir}/program/resource +%{baseinstdir}/program/resource/abpen-US.res +%{baseinstdir}/program/resource/adabasuien-US.res +%{baseinstdir}/program/resource/cnren-US.res +%{baseinstdir}/program/resource/dbpen-US.res +%{baseinstdir}/program/resource/rpten-US.res +%{baseinstdir}/program/resource/rptuien-US.res +%{baseinstdir}/program/resource/sdbclen-US.res +%{baseinstdir}/program/resource/sdberren-US.res +%{baseinstdir}/share/registry/base.xcd +%{baseinstdir}/program/sbase +%{_datadir}/applications/libreoffice-base.desktop +%{_bindir}/oobase -# libre -# %{_sysconfdir}/bash_completion.d/libreoffice3.3.sh -# %{_sysconfdir}/profile.d/openoffice.org.* -# %{_bindir}/ooconfig3.3 -# %{_bindir}/ootool3.3 +%files report-builder +%docdir %{baseinstdir}/share/extensions/report-builder/help +%{baseinstdir}/share/extensions/report-builder -# libre -# %{_datadir}/applications/template*.desktop +%files bsh +%{baseinstdir}/program/classes/ScriptProviderForBeanShell.jar +%{baseinstdir}/program/services/scriptproviderforbeanshell.rdb +%{baseinstdir}/share/Scripts/beanshell -# new icons -# %{_datadir}/icons/hicolor/*/apps/openofficeorg3-*.png -# moved to mandriva-kde-config -#%{_datadir}/icons/hicolor/*/mimetypes/openofficeorg3-*.png -# %{_datadir}/icons/gnome/*/apps/openofficeorg3-*.png -# %{_datadir}/icons/gnome/*/mimetypes/openofficeorg3-*.png - - -# libre -# %{_datadir}/pixmaps/ooo-base3.3.png -# %{_datadir}/pixmaps/ooo-calc3.3.png -# %{_datadir}/pixmaps/ooo-draw3.3.png -# %{_datadir}/pixmaps/ooo-gulls3.3.png -# %{_datadir}/pixmaps/ooo-impress3.3.png -# %{_datadir}/pixmaps/ooo-math3.3.png -# %{_datadir}/pixmaps/ooo-template3.3.png -# %{_datadir}/pixmaps/ooo-web3.3.png -# %{_datadir}/pixmaps/ooo-writer3.3.png - -%{_mandir}/man1/loffice* -%{_mandir}/man1/lofromtemplate* -%{_mandir}/man1/libreoffice* - -#dev300 -# %ghost %{ooodir}/share/uno_packages -# %ghost %{ooodir}/program/bootstraprc -# %ghost %{ooodir}/program/versionrc -# %ghost %{ooodir}/%basis/share/registry/data/org/openoffice/Setup.xcu - -%{_mandir}/man1/unopkg.1* - -# libre -# %{_datadir}/applications/ooo-extension-manager*.desktop - -# Anssi -%dir %{ooodir}/extensions - -%files core -f file-lists/core_list.txt - -%files devel -f file-lists/sdk_list.uniq.sorted.txt - -%files devel-doc -f file-lists/sdk_doc_list.txt - -%files draw -f file-lists/draw_list.txt -%defattr(-,root,root,-) -# %{_datadir}/applications/draw.desktop -# libre -# %{_datadir}/templates/ooo-drawing.desktop -# %{_datadir}/templates/.source/ooo-drawing.odg -%{_mandir}/man1/lodraw* -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg - -# dev300: -# %files dtd-officedocument1.0 -f build/dtd_list.txt - -# dev300: -%files filter-binfilter -f file-lists/filter-binfilter_list.txt - -%files gnome -f file-lists/gnome_list.uniq.sorted.txt - -%files impress -f file-lists/impress_list.txt -%defattr(-,root,root,-) -# %{_datadir}/applications/impress.desktop -# libre -# %{_datadir}/templates/ooo-presentation.desktop -# %{_datadir}/templates/.source/ooo-presentation.odp -%{_mandir}/man1/loimpress* -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg - -%files java-common -f file-lists/java_common_list.txt - -%files kde4 -f file-lists/kde4_list.txt - -%files math -f file-lists/math_list.txt -%defattr(-,root,root,-) -# %{_datadir}/applications/math.desktop -%{_mandir}/man1/lomath* -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo-math_72.svg - -%files openclipart -f file-lists/gallery_list.txt - -%files pyuno -f file-lists/pyuno_list.txt - -#%files qa-api-tests -#%{ooodir}/qadevOOo - -%files testtool -f file-lists/testtool_list.txt - -%files style-galaxy -%defattr(-,root,root,-) -%{ooodir}/%basis/share/config/images.zip - -%files style-crystal -%defattr(-,root,root,-) -%{ooodir}/%basis/share/config/images_crystal.zip - -%files style-hicontrast -%defattr(-,root,root,-) -%{ooodir}/%basis/share/config/images_hicontrast.zip - -%files style-tango -%defattr(-,root,root,-) -%{ooodir}/%basis/share/config/images_tango.zip - -%files style-oxygen -%defattr(-,root,root,-) -%{ooodir}/%basis/share/config/images_oxygen.zip - -%files writer -f file-lists/writer_list.txt -%defattr(-,root,root,-) -# %{_datadir}/applications/writer.desktop -# libre -#%{_datadir}/applications/web.desktop -# libre -# %{_datadir}/templates/ooo-text.desktop -# %{_datadir}/templates/.source/ooo-text.odt -%{_mandir}/man1/loweb* -%{_mandir}/man1/lowriter* -%{_datadir}/icons/hicolor/scalable/apps/mandriva-rosa-lo-writer_72.svg - -%if %{use_mono} -%files mono -f file-lists/mono_list.txt -%defattr(-,root,root) -%{_libdir}/pkgconfig/mono-ooo.pc -# %{_libdir}/pkgconfig/mono-ooo%{mdvsuffix}-2.3.pc -# %{_libdir}/mono/*/*/* -# %{_libdir}/mono/ooo-%{mdvsuffix} -%endif - -%files pdfimport -%defattr(-,root,root,-) -%{ooodir}/extensions/pdfimport.oxt - -%files presenter-screen -%defattr(-,root,root,-) -%{ooodir}/extensions/presenter-screen.oxt - -# %files report-builder -# %defattr(-,root,root,-) -# %{ooodir}/sun-report-builder.oxt +%files rhino +%{baseinstdir}/program/classes/js.jar +%{baseinstdir}/program/classes/ScriptProviderForJavaScript.jar +%{baseinstdir}/program/services/scriptproviderforjavascript.rdb +%{baseinstdir}/share/Scripts/javascript %files wiki-publisher -%defattr(-,root,root,-) -%{ooodir}/extensions/wiki-publisher.oxt +%docdir %{baseinstdir}/share/extensions/wiki-publisher/license +%{baseinstdir}/share/extensions/wiki-publisher + +%files nlpsolver +%docdir %{baseinstdir}/share/extensions/nlpsolver/help +%{baseinstdir}/share/extensions/nlpsolver + +%files ogltrans +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/program/OGLTrans.uno.so +%dir %{baseinstdir}/share/config +%dir %{baseinstdir}/share/config/soffice.cfg +%dir %{baseinstdir}/share/config/soffice.cfg/simpress +%{baseinstdir}/share/config/soffice.cfg/simpress/transitions-ogl.xml +%{baseinstdir}/share/registry/ogltrans.xcd %files presentation-minimizer +%docdir %{baseinstdir}/share/extensions/presentation-minimizer/help +%{baseinstdir}/share/extensions/presentation-minimizer + +%files presenter-screen +%docdir %{baseinstdir}/share/extensions/presenter-screen/help +%{baseinstdir}/share/extensions/presenter-screen + +%files pdfimport +%docdir %{baseinstdir}/share/extensions/pdfimport/help +%{baseinstdir}/share/extensions/pdfimport + +%_font_pkg -n %{fontname} opens___.ttf +%doc solver/unxlng*/bin/ure/LICENSE + +%files calc +%dir %{baseinstdir} +%{baseinstdir}/help/en/scalc.* +%dir %{baseinstdir}/program +%{baseinstdir}/program/libanalysislo.so +%{baseinstdir}/program/libcalclo.so +%{baseinstdir}/program/libdatelo.so +%{baseinstdir}/program/libforlo.so +%{baseinstdir}/program/libforuilo.so +%{baseinstdir}/program/libsclo.so +%{baseinstdir}/program/libscdlo.so +%{baseinstdir}/program/libscfiltlo.so +%{baseinstdir}/program/libscuilo.so +%{baseinstdir}/program/libsolverlo.so +%dir %{baseinstdir}/program/resource +%{baseinstdir}/program/resource/analysisen-US.res +%{baseinstdir}/program/resource/dateen-US.res +%{baseinstdir}/program/resource/foren-US.res +%{baseinstdir}/program/resource/foruien-US.res +%{baseinstdir}/program/resource/scen-US.res +%{baseinstdir}/program/resource/solveren-US.res +%{baseinstdir}/program/vbaobj.uno.so +%{baseinstdir}/share/registry/calc.xcd +%{baseinstdir}/program/pagein-calc +%{baseinstdir}/program/scalc +%{_datadir}/applications/libreoffice-calc.desktop +%{_bindir}/oocalc + +%files draw +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/help/en/sdraw.* +%{baseinstdir}/share/registry/draw.xcd +%{baseinstdir}/program/libvisioimportlo.so +%{baseinstdir}/program/pagein-draw +%{baseinstdir}/program/sdraw +%{_datadir}/applications/libreoffice-draw.desktop +%{_bindir}/oodraw + +%files emailmerge +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/program/mailmerge.py* +%{baseinstdir}/program/msgbox.py* +%{baseinstdir}/program/officehelper.py* + +%files writer +%dir %{baseinstdir} +%{baseinstdir}/help/en/swriter.* +%dir %{baseinstdir}/program +%{baseinstdir}/program/libdoctoklo.so +%{baseinstdir}/program/libhwplo.so +%{baseinstdir}/program/liblwpftlo.so +%{baseinstdir}/program/libmswordlo.so +%{baseinstdir}/program/libmsworkslo.so +%{baseinstdir}/program/libooxmllo.so +%{baseinstdir}/program/libresourcemodello.so +%{baseinstdir}/program/librtftoklo.so +%{baseinstdir}/program/libswdlo.so +%{baseinstdir}/program/libswuilo.so +%{baseinstdir}/program/libt602filterlo.so +%{baseinstdir}/program/libwpftlo.so +%{baseinstdir}/program/libwriterfilterlo.so +%{baseinstdir}/program/vbaswobj.uno.so +%dir %{baseinstdir}/program/resource +%{baseinstdir}/program/resource/t602filteren-US.res +%{baseinstdir}/share/registry/writer.xcd +%{baseinstdir}/program/pagein-writer +%{baseinstdir}/program/swriter +%{_datadir}/applications/libreoffice-writer.desktop +%{_bindir}/oowriter + +%files impress +%dir %{baseinstdir} +%{baseinstdir}/help/en/simpress.* +%dir %{baseinstdir}/program +%{baseinstdir}/program/libanimcorelo.so +%{baseinstdir}/program/libplacewarelo.so +%dir %{baseinstdir}/share/config +%dir %{baseinstdir}/share/config/soffice.cfg +%dir %{baseinstdir}/share/config/soffice.cfg/simpress +%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml +%{baseinstdir}/share/config/soffice.cfg/simpress/transitions.xml +%{baseinstdir}/share/registry/impress.xcd +%{baseinstdir}/program/pagein-impress +%{baseinstdir}/program/simpress +%{_datadir}/applications/libreoffice-impress.desktop +%{_bindir}/ooimpress + +%files math +%dir %{baseinstdir} +%{baseinstdir}/help/en/smath.* +%dir %{baseinstdir}/program +%{baseinstdir}/program/libsmlo.so +%{baseinstdir}/program/libsmdlo.so +%dir %{baseinstdir}/program/resource +%{baseinstdir}/program/resource/smen-US.res +%{baseinstdir}/share/registry/math.xcd +%{baseinstdir}/program/smath +%{_datadir}/applications/libreoffice-math.desktop +%{_bindir}/oomath + +%files graphicfilter +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/program/libflashlo.so +%{baseinstdir}/program/libsvgfilterlo.so +%{baseinstdir}/share/registry/graphicfilter.xcd + +%files xsltfilter +%dir %{baseinstdir} +%dir %{baseinstdir}/share/xslt +%{baseinstdir}/share/xslt/docbook +%dir %{baseinstdir}/share/xslt/export +%{baseinstdir}/share/xslt/export/uof +%{baseinstdir}/share/xslt/export/xhtml +%dir %{baseinstdir}/share/xslt/import +%{baseinstdir}/share/xslt/import/uof +%{baseinstdir}/share/registry/xsltfilter.xcd + +%files javafilter +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%dir %{baseinstdir}/program/classes +%{baseinstdir}/program/classes/aportisdoc.jar +%{baseinstdir}/program/classes/pexcel.jar +%{baseinstdir}/program/classes/pocketword.jar +%{_datadir}/applications/libreoffice-javafilter.desktop +%{baseinstdir}/share/registry/palm.xcd +%{baseinstdir}/share/registry/pocketexcel.xcd +%{baseinstdir}/share/registry/pocketword.xcd + +%files postgresql %defattr(-,root,root,-) -%{ooodir}/extensions/presentation-minimizer.oxt - -%if %l10n -%files l10n-it -f file-lists/lang_it_list.txt -%defattr(-,root,root) - -%files l10n-af -f file-lists/lang_af_list.txt -%defattr(-,root,root) - -%files l10n-ar -f file-lists/lang_ar_list.txt -%defattr(-,root,root) - -%files l10n-as -f file-lists/lang_as_list.txt -%defattr(-,root,root) - -%files l10n-bg -f file-lists/lang_bg_list.txt -%defattr(-,root,root) - -%files l10n-bn -f file-lists/lang_bn_list.txt -%defattr(-,root,root) - -%files l10n-br -f file-lists/lang_br_list.txt -%defattr(-,root,root) - -%files l10n-bs -f file-lists/lang_bs_list.txt -%defattr(-,root,root) - -%files l10n-ca -f file-lists/lang_ca_list.txt -%defattr(-,root,root) - -%files l10n-cs -f file-lists/lang_cs_list.txt -%defattr(-,root,root) - -%files l10n-cy -f file-lists/lang_cy_list.txt -%defattr(-,root,root) - -%files l10n-da -f file-lists/lang_da_list.txt -%defattr(-,root,root) - -%files l10n-de -f file-lists/lang_de_list.txt -%defattr(-,root,root) - -%files l10n-dz -f file-lists/lang_dz_list.txt -%defattr(-,root,root) - -%files l10n-el -f file-lists/lang_el_list.txt -%defattr(-,root,root) - -%files l10n-en_GB -f file-lists/lang_en_GB_list.txt -%defattr(-,root,root) - -%files l10n-es -f file-lists/lang_es_list.txt -%defattr(-,root,root) - -%files l10n-et -f file-lists/lang_et_list.txt -%defattr(-,root,root) - -%files l10n-eu -f file-lists/lang_eu_list.txt -%defattr(-,root,root) - -%files l10n-fa -f file-lists/lang_fa_list.txt -%defattr(-,root,root) - -%files l10n-fi -f file-lists/lang_fi_list.txt -%defattr(-,root,root) - -%files l10n-fr -f file-lists/lang_fr_list.txt -%defattr(-,root,root) - -%files l10n-ga -f file-lists/lang_ga_list.txt -%defattr(-,root,root) - -%files l10n-gl -f file-lists/lang_gl_list.txt -%defattr(-,root,root) - -%files l10n-gu -f file-lists/lang_gu_list.txt -%defattr(-,root,root) - -%files l10n-he -f file-lists/lang_he_list.txt -%defattr(-,root,root) - -%files l10n-hi -f file-lists/lang_hi_list.txt -%defattr(-,root,root) - -%files l10n-hr -f file-lists/lang_hr_list.txt -%defattr(-,root,root) - -%files l10n-hu -f file-lists/lang_hu_list.txt -%defattr(-,root,root) - -%files l10n-ja -f file-lists/lang_ja_list.txt -%defattr(-,root,root) - -%files l10n-kn -f file-lists/lang_kn_list.txt -%defattr(-,root,root) - -%files l10n-ko -f file-lists/lang_ko_list.txt -%defattr(-,root,root) - -%files l10n-lt -f file-lists/lang_lt_list.txt -%defattr(-,root,root) - -%files l10n-lv -f file-lists/lang_lv_list.txt -%defattr(-,root,root) - -%files l10n-mai -f file-lists/lang_mai_list.txt -%defattr(-,root,root) - -%files l10n-ml -f file-lists/lang_ml_list.txt -%defattr(-,root,root) - -%files l10n-mk -f file-lists/lang_mk_list.txt -%defattr(-,root,root) - -%files l10n-mr -f file-lists/lang_mr_list.txt -%defattr(-,root,root) - -%files l10n-nb -f file-lists/lang_nb_list.txt -%defattr(-,root,root) - -%files l10n-nl -f file-lists/lang_nl_list.txt -%defattr(-,root,root) - -%files l10n-nn -f file-lists/lang_nn_list.txt -%defattr(-,root,root) - -%files l10n-nr -f file-lists/lang_nr_list.txt -%defattr(-,root,root) - -%files l10n-nso -f file-lists/lang_nso_list.txt -%defattr(-,root,root) - -%files l10n-or -f file-lists/lang_or_list.txt -%defattr(-,root,root) - -%files l10n-pa_IN -f file-lists/lang_pa_IN_list.txt -%defattr(-,root,root) - -%files l10n-pl -f file-lists/lang_pl_list.txt -%defattr(-,root,root) - -%files l10n-pt -f file-lists/lang_pt_list.txt -%defattr(-,root,root) - -%files l10n-pt_BR -f file-lists/lang_pt_BR_list.txt -%defattr(-,root,root) - -%files l10n-ro -f file-lists/lang_ro_list.txt -%defattr(-,root,root) - -%files l10n-ru -f file-lists/lang_ru_list.txt -%defattr(-,root,root) - -%files l10n-sh -f file-lists/lang_sh_list.txt -%defattr(-,root,root) - -%files l10n-si -f file-lists/lang_si_list.txt -%defattr(-,root,root) - -%files l10n-sk -f file-lists/lang_sk_list.txt -%defattr(-,root,root) - -%files l10n-sl -f file-lists/lang_sl_list.txt -%defattr(-,root,root) - -%files l10n-sr -f file-lists/lang_sr_list.txt -%defattr(-,root,root) - -%files l10n-ss -f file-lists/lang_ss_list.txt -%defattr(-,root,root) - -%files l10n-st -f file-lists/lang_st_list.txt -%defattr(-,root,root) - -%files l10n-sv -f file-lists/lang_sv_list.txt -%defattr(-,root,root) - -%files l10n-ta -f file-lists/lang_ta_list.txt -%defattr(-,root,root) - -%files l10n-te -f file-lists/lang_te_list.txt -%defattr(-,root,root) - -%files l10n-th -f file-lists/lang_th_list.txt -%defattr(-,root,root) - -%files l10n-tn -f file-lists/lang_tn_list.txt -%defattr(-,root,root) - -%files l10n-tr -f file-lists/lang_tr_list.txt -%defattr(-,root,root) - -%files l10n-ts -f file-lists/lang_ts_list.txt -%defattr(-,root,root) - -%files l10n-uk -f file-lists/lang_uk_list.txt -%defattr(-,root,root) - -%files l10n-ve -f file-lists/lang_ve_list.txt -%defattr(-,root,root) - -%files l10n-xh -f file-lists/lang_xh_list.txt -%defattr(-,root,root) - -%files l10n-zh_CN -f file-lists/lang_zh_CN_list.txt -%defattr(-,root,root) - -%files l10n-zh_TW -f file-lists/lang_zh_TW_list.txt -%defattr(-,root,root) - -%files l10n-zu -f file-lists/lang_zu_list.txt -%defattr(-,root,root) - -%files help-bg -f file-lists/help_bg_list.txt -%defattr(-,root,root) - -%files help-bn -f file-lists/help_bn_list.txt -%defattr(-,root,root) - -%files help-bs -f file-lists/help_bs_list.txt -%defattr(-,root,root) - -%files help-ca -f file-lists/help_ca_list.txt -%defattr(-,root,root) - -%files help-cs -f file-lists/help_cs_list.txt -%defattr(-,root,root) - -%files help-da -f file-lists/help_da_list.txt -%defattr(-,root,root) - -%files help-de -f file-lists/help_de_list.txt -%defattr(-,root,root) - -%files help-dz -f file-lists/help_dz_list.txt -%defattr(-,root,root) - -%files help-el -f file-lists/help_el_list.txt -%defattr(-,root,root) - -%files help-en_GB -f file-lists/help_en_GB_list.txt -%defattr(-,root,root) - -%files help-es -f file-lists/help_es_list.txt -%defattr(-,root,root) - -%files help-et -f file-lists/help_et_list.txt -%defattr(-,root,root) - -%files help-eu -f file-lists/help_eu_list.txt -%defattr(-,root,root) - -%files help-fi -f file-lists/help_fi_list.txt -%defattr(-,root,root) - -%files help-fr -f file-lists/help_fr_list.txt -%defattr(-,root,root) - -%files help-gl -f file-lists/help_gl_list.txt -%defattr(-,root,root) - -%files help-gu -f file-lists/help_gu_list.txt -%defattr(-,root,root) - -%files help-he -f file-lists/help_he_list.txt -%defattr(-,root,root) - -%files help-hi -f file-lists/help_hi_list.txt -%defattr(-,root,root) - -%files help-hr -f file-lists/help_hr_list.txt -%defattr(-,root,root) - -%files help-hu -f file-lists/help_hu_list.txt -%defattr(-,root,root) - -%files help-it -f file-lists/help_it_list.txt -%defattr(-,root,root) - -%files help-ja -f file-lists/help_ja_list.txt -%defattr(-,root,root) - -%files help-ko -f file-lists/help_ko_list.txt -%defattr(-,root,root) - -%files help-mk -f file-lists/help_mk_list.txt -%defattr(-,root,root) - -%files help-nb -f file-lists/help_nb_list.txt -%defattr(-,root,root) - -%files help-nl -f file-lists/help_nl_list.txt -%defattr(-,root,root) - -%files help-nn -f file-lists/help_nn_list.txt -%defattr(-,root,root) - -%files help-pl -f file-lists/help_pl_list.txt -%defattr(-,root,root) - -%files help-pt -f file-lists/help_pt_list.txt -%defattr(-,root,root) - -%files help-pt_BR -f file-lists/help_pt_BR_list.txt -%defattr(-,root,root) - -%files help-ru -f file-lists/help_ru_list.txt -%defattr(-,root,root) - -%files help-si -f file-lists/help_si_list.txt -%defattr(-,root,root) - -%files help-sk -f file-lists/help_sk_list.txt -%defattr(-,root,root) - -%files help-sl -f file-lists/help_sl_list.txt -%defattr(-,root,root) - -%files help-sv -f file-lists/help_sv_list.txt -%defattr(-,root,root) - -%files help-tr -f file-lists/help_tr_list.txt -%defattr(-,root,root) - -%files help-uk -f file-lists/help_uk_list.txt -%defattr(-,root,root) - -%files help-zh_CN -f file-lists/help_zh_CN_list.txt -%defattr(-,root,root) - -%files help-zh_TW -f file-lists/help_zh_TW_list.txt -%defattr(-,root,root) - -%files help-en_US -f file-lists/help_en_US_list.txt -%defattr(-,root,root) +%{baseinstdir}/program/postgresql-sdbc.uno.so +%{baseinstdir}/program/postgresql-sdbc-impl.uno.so +%{baseinstdir}/program/postgresql-sdbc.ini +%{baseinstdir}/program/services/postgresql-sdbc.rdb +%{baseinstdir}/share/registry/postgresqlsdbc.xcd + +%files ure +%doc solver/unxlng*/bin/ure/LICENSE +%dir %{baseinstdir} +%{ureinstdir} +%exclude %{ureinstdir}/lib/libjvm*.so* + +%files sdk +%{sdkinstdir}/ +%exclude %{sdkinstdir}/docs/ +%exclude %{sdkinstdir}/examples/ + +%files sdk-doc +%docdir %{sdkinstdir}/docs +%{sdkinstdir}/docs/ +%{sdkinstdir}/examples/ + +%files headless +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/program/libbasebmplo.so +%{baseinstdir}/program/libvclplug_svplo.so + +%files pyuno +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/program/libpyuno.so +%{baseinstdir}/program/pythonloader.py* +%{baseinstdir}/program/pythonloader.uno.so +%{baseinstdir}/program/pythonloader.unorc +%{baseinstdir}/program/pyuno.so +%{baseinstdir}/program/wizards +%dir %{baseinstdir}/share/Scripts +%{baseinstdir}/share/Scripts/python +%{python_sitearch}/uno.py* +%{python_sitearch}/unohelper.py* +%{baseinstdir}/share/extensions/script-provider-for-python +%{baseinstdir}/share/registry/pyuno.xcd + +%files kde +%dir %{baseinstdir} +%dir %{baseinstdir}/program +%{baseinstdir}/program/kde-open-url +%{baseinstdir}/program/kde4be1.uno.so +%{baseinstdir}/program/fps_kde4.uno.so +%{baseinstdir}/program/libvclplug_kde4lo.so + +%files java-common +%dir %{baseinstdir}/program/classes +%{baseinstdir}/program/classes/agenda.jar +%{baseinstdir}/program/classes/commonwizards.jar +%{baseinstdir}/program/classes/fax.jar +%{baseinstdir}/program/classes/form.jar +%{baseinstdir}/program/classes/query.jar +%{baseinstdir}/program/classes/letter.jar +%{baseinstdir}/program/classes/LuceneHelpWrapper.jar +%{baseinstdir}/program/classes/officebean.jar +%{baseinstdir}/program/classes/report.jar +%{baseinstdir}/program/classes/saxon9.jar +%{baseinstdir}/program/classes/ScriptFramework.jar +%{baseinstdir}/program/classes/ScriptProviderForJava.jar +%{baseinstdir}/program/classes/table.jar +%{baseinstdir}/program/classes/unoil.jar +%{baseinstdir}/program/classes/web.jar +%{baseinstdir}/program/classes/XMergeBridge.jar +%{baseinstdir}/program/classes/xmerge.jar +%{baseinstdir}/program/classes/XSLTFilter.jar +%{baseinstdir}/program/classes/XSLTValidate.jar +%{baseinstdir}/program/libofficebean.so +%{baseinstdir}/share/Scripts/java + +%if %{with binfilter} +%files binfilter +%{baseinstdir}/program/legacy_binfilters.rdb +%{baseinstdir}/program/libbf_frmlo.so +%{baseinstdir}/program/libbf_golo.so +%{baseinstdir}/program/libbf_migratefilterlo.so +%{baseinstdir}/program/libbf_ofalo.so +%{baseinstdir}/program/libbf_sblo.so +%{baseinstdir}/program/libbf_schlo.so +%{baseinstdir}/program/libbf_sclo.so +%{baseinstdir}/program/libbf_sdlo.so +%{baseinstdir}/program/libbf_smlo.so +%{baseinstdir}/program/libbf_solo.so +%{baseinstdir}/program/libbf_svtlo.so +%{baseinstdir}/program/libbf_svxlo.so +%{baseinstdir}/program/libbf_swlo.so +%{baseinstdir}/program/libbf_wrapperlo.so +%{baseinstdir}/program/libbf_xolo.so +%{baseinstdir}/program/libbindetlo.so +%{baseinstdir}/program/liblegacy_binfilterslo.so +%{baseinstdir}/program/resource/bf_frmen-US.res +%{baseinstdir}/program/resource/bf_ofaen-US.res +%{baseinstdir}/program/resource/bf_scen-US.res +%{baseinstdir}/program/resource/bf_schen-US.res +%{baseinstdir}/program/resource/bf_sden-US.res +%{baseinstdir}/program/resource/bf_smen-US.res +%{baseinstdir}/program/resource/bf_svten-US.res +%{baseinstdir}/program/resource/bf_svxen-US.res +%{baseinstdir}/program/resource/bf_swen-US.res +%{baseinstdir}/share/registry/binfilter.xcd +%{_datadir}/applications/libreoffice-binfilter.desktop %endif -#removed --with-system-hsqldb -# BuildRequires: ant-apache-regexp - %changelog -* Sat Feb 04 2012 Rafael da Veiga Cabral 1:3.4.5-1mdv2012.0 -+ Revision: 771188 -- add libsuffix in the drop gtk thing -- removes OOo leftover - + Bernhard Rosenkraenzer - - Drop GTK dependency from -core - - Update to 3.4.5 - - Fix build in current environment +* Thu Sep 11 2012 akdengi 3.5.5.3-0.3 +- use Mageia spec and src to build +- add ROSA icon patch +- add dictionary source +- add rpmlint rule +- drop debug +- use ROSA vendor -* Wed Dec 21 2011 Per Øyvind Karlsen 1:3.4.4-2 -+ Revision: 744059 -- add build dependency on newer rpm-build to avoid broken unpackage subdir check -- don't own %%{_datadir}/mime{,/packages} +* Wed Jul 11 2012 dmorgan 3.5.5.3-0.3.mga2 ++ Revision: 269555 +- Resolves: rhbz#838368 --view ignored while -view accepted +- Resolves: rhbz#838248 calc standard filter doesn't show criteria after file re-open +- Rebuild because of missing rpms +- New version 3.5.5.3 +- Fix icon in startcenter too ( mga #5876) +- Add lucene-contrib as Require +- 3.5.5 rc1 +- drop integrated 0001-make-hsqldb-build-with-java-1.7.patch +- drop integrated 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch +- drop integrated 0001-silence-SolarMutex-not-locked-spew.patch +- drop integrated 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch +- drop integrated 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch +- drop integrated 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch +- New version 3.5.3 final - + Rafael da Veiga Cabral - - add further fixes for gcc 4.6.2 build issues - (libreoffice34-gcc462.patch) - - fix build issues with gcc 4.6.2 #64945 (experimental) - - remove duplicate binfilter files (rpm 5 checkings) - - add ORBit2 buildrequire for the shell module - - fixes #64789, add help-images-mdv64789.patch - tries all possible style files starting with oxygen - - fix typo help-br to help-bs - - uses javaless flag to deal with some java stack broken stuff - - merges javaless branch fixes: - - add buildrequire poppler-cpp-devel - - pushes further poppler 0.18.1 fixes directly into - poppler0.18.1.patch - mostly api fixes already integrated into 3.4.4.2 - - check for qt 4.8.1 in disable-qtunixeventloop.patch - - update to version 3.4.4.2 - - new icons for math and startcenter - - dropped %%undefine debug_package_and_restore as - it breaks the install section - - poppler 0.18.1 compatibility (DCStream) class dropped - - glib2.31 requires a single include for glib.h instead of glib/g*.h - - add poppler-glib-devel buildrequire required for poppler 0.18.1 - - uses mklibname to get the right arch lib - - makes rpmlint more happy: - removes unversioned and unneeded Obsoletes - add %%defattr(-,root,root,-) for some packages - removes style-industrial package section as - it is not provided anymore - - fix "OpenOffice.org" leftovers in packages description - and summary #64658 - - fix --with-num-cpus, uses at most 4 parallel jobs - - add hsqdl 1.8.0, apache-ant-1.8.1, commons-httpclient, - commons-codec and commons-lang bundles +* Fri Apr 13 2012 dmorgan 3.5.2.2-2.mga2 ++ Revision: 230672 +- New version 3.5.2.2 +- Add libexttextcat as requires of core package -* Tue Oct 11 2011 Rafael da Veiga Cabral 1:3.4.3-3 -+ Revision: 704136 -- add support for locales: as, bn, dz,fa, ga, - gl, gu, hr, kn, lt, lv, mai, ml, mr, nr, nso, or, - pa-IN, ro, sh, si, sr, ss, st, te, th, tn, ts, - uk, ve, and xh -- temporary changes for building purposes: - removes --with-system-hsqldb - removes ant-apache-regexp buildrequire +* Tue Mar 06 2012 dmorgan 3.5.1.2-1.mga2 ++ Revision: 220059 +- New version 3.5.1 rc2 + +* Tue Feb 28 2012 dmorgan 3.5.1.1-1.mga2 ++ Revision: 215796 +- New version 3.5.1.1 + +* Tue Feb 07 2012 dmorgan 3.5.0.3-3.mga2 ++ Revision: 205949 +- Fix menu icons ( dams ) + +* Tue Feb 07 2012 dmorgan 3.5.0.3-2.mga2 ++ Revision: 205722 +- Explicitly exclude files that belong to libreoffice-java-common to make sure they are not in core subpackage too +- split legacy binary filters into subpackage +- Resolves: rhbz#786328 add nlpsolver subpackage +- New version 3.5.0.3 +- New version 3.5.0 rc2 +- add libreoffice-postgresql subpackage + + + kamil + - build against new mythes-devel + - clean spec + +* Thu Jan 05 2012 dmorgan 3.4.99.2-3.mga2 ++ Revision: 190890 +- Workaround missing menu icons + +* Wed Dec 28 2011 dmorgan 3.4.99.2-2.mga2 ++ Revision: 188342 +- Add missing files forgotten when merging from fedora + +* Wed Dec 28 2011 dmorgan 3.4.99.2-1.mga2 ++ Revision: 188283 +- use system mysql-connector-c++ +- New version 3.5 Beta2 +- Requires a langpack ( mga #3830) +- Fix file list +- 3.5.0 beta1 ( Synced with Fedora ) + - drop integrated 0001-Related-fdo-37195-migrationoo3-not-registered.patch + - drop integrated 0001-Related-i58612-don-t-crash-anyway.patch + - drop integrated 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch + - drop integrated 0001-Related-rhbz-702833-addEventListener-without-removeE.patch + - drop integrated 0001-Related-rhbz-711087-band-aid.patch + - drop integrated 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch + - drop integrated 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch + - drop integrated 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch + - drop integrated 0001-Resolves-fdo-32665-handle-that-FreeSerif-lacks-some-.patch + - drop integrated 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch + - drop integrated 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch + - drop integrated 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch + - drop integrated 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch + - drop integrated 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch + - drop integrated 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch + - drop integrated 0001-add-Oracle-Java-1.7.0-recognition.patch + - drop integrated 0001-avoid-using-com.sun.org-apis.patch + - drop integrated 0001-bubble-down-configure-test-findings-on-visibility.patch + - drop integrated 0001-fix-horizontal-scrollbars-with-KDE-oxygen-style-bnc-.patch + - drop integrated 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch + - drop integrated 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch + - drop integrated 0001-rhbz-667082-do-not-crash-importing-section-containin.patch + - drop integrated 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch + - drop integrated Backport-reading-AES-encrypted-ODF-1.2-documents.patch + - drop integrated gdb-pretty-printers.patch + - drop integrated kde4configure.patch + - drop integrated libreoffice-ppc64.patch + - drop integrated openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch + - drop integrated openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch + - drop integrated vbahelper.visibility.patch + - drop libreoffice-testtools subpackage, because testtool has been + removed by upstream +- Remove useless suggests + +* Tue Dec 20 2011 dmorgan 3.4.4.2-1.mga2 ++ Revision: 184846 +- Suggests hunspell-en ( mga #2942) +- Use X-Mageia-CrossDesktop desktop category +- Resolves: rhbz#757653 fix headless crash with cairo canvas +- Resolves: rhbz#757653 fix headless crash with cairo canvas +- Resolves: rhbz#751290 - [kde] LibreOffice has black on dark-grey tooltip-texts +- Resolves: fdo#42749 KDE oxygen theme and scrollbars +- Related: fdo#42534 0001-Related-i58612-don-t-crash-anyway.patch +- Remove P23 +- P31: add FcPatternGetMatrix wrapper +- Resolves: rhbz#665800 missing glyph symbol shown when toggling bold/italic + for Sinhala text +- possible fix for java 1.7.0 detection +- New version 3.4.4.2 +- allow building with gcj +- fix .sdw import +- Resolves: rhbz#747356 let Qt call XInitThreads +- Related: rhbz#743750 addXineramaScreenUnique issue +- Related: rhbz#743750 addXineramaScreenUnique issue + +* Fri Oct 28 2011 fwang 3.4.3.2-2.mga2 ++ Revision: 158963 +- rebuild for new poppler + +* Thu Oct 20 2011 blino 3.4.3.2-1.mga2 ++ Revision: 156740 +- use Development/Other group for gdb-debug-support subpackage + (Development/Debug is reserved for packages with sources + symbols) + + + dmorgan + - Remove nso help package + - Really disable lv language + - Do not package lv language + - Fix typo + - New version 3.4.3 rc2 + Sync with fedora + + + ovitters + - add pkgconfig(poppler-glib) to buildrequires + - fix poppler patch + - enable fedora poppler patch + - add pkgconfig(ORBit-2.0) to buildrequires + - rebuild for new poppler + +* Wed Sep 14 2011 fwang 3.4.3.1-2.mga2 ++ Revision: 143384 +- br dbus-glib +- fix vigra dep +- rebuild for new libpng +- fix group + + + dmorgan + - Update to Libreoffice 3.4.3 rc1 + Sync with fedora patches + - Fix groups + - Do not apply poppler patch now, our version is not recent enough + - Add Fedora patches + - Rediff patches + - New version 3.4.2 rc2 + +* Sat Jul 16 2011 dmorgan 3.4.2.1-2.mga2 ++ Revision: 124721 +- Fix requires exception + +* Sat Jul 16 2011 dmorgan 3.4.2.1-1.mga2 ++ Revision: 124702 +- New version 3.4.2 RC1 + + + ahmad + - Change libpoppler-*-devel BR to pkgconfig style + +* Tue Jul 12 2011 dmorgan 3.4.1.3-4.mga2 ++ Revision: 123089 +- Fix file list +- Add Si help package +- Oooops, ts has no help +- More fixes for help packages +- Disable fa language +- Disable fa language +- Disable breton translation +- Fix br.filelist find +- Re enable br workaround +- Fix br language +- Clean spec file +- SYnc a little more with fedora +- Use bundled translate-toolkit +- Try to use system translate-toolkit +- Try to use system translate-toolkit +- Fix configure option +- Fix configure options +- Fix configure option +- Disable patch100 +- Fix translations file list +- Sync with fedora +- lt has no help +- Fix patch16 +- fix compiler issue +- fix compiler issue +- bubble down configure test findings on visibility +- Resolves: rhbz#695509 crash in RefreshDocumentLB +- various translations do not translate helpcontent2 +- Fix tests +- Fix patch13 +- gcc vis still problematic +- fix broken da templates +- recalculate POORHELPS from .po files +- ns now correctly named as nso +- various renames +- binfilter disabled by default, re-enable +- gengalrc gone too +- Fix file list +- Fix UDP to 300 +- Fix file list +- fix patch post BOOL, etc. changes +- require at least one font in order to run unit tests +- More kde4 build fixes +- backport KDE4 build fix +- Fix build +- remove missing languages and graphite2 +- drop integrated 0001-add-flat-xml-types-to-.desktop-files-etc.patch +- drop integrated libreoffice-fdo31271.icu.patch +- Use fedora changelog : +- drop openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch + + in favour of ooosplash +- drop openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch + + because components are passively registered now +- drop integrated openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch +- drop integrated turn-script-providers-into-extensions.patch +- drop integrated 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch +- drop integrated 0001-free-ctxt-after-taking-lastError-details.patch +- drop integrated 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch +- drop integrated libreoffice-gcc4.6.0.patch +- drop integrated 0001-fexceptions-fexceptions.patch +- drop integrated 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch +- drop vbahelper.visibility.patch +- drop integrated 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch +- drop integrated 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch +- drop integrated 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch +- drop integrated 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch +- drop integrated 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch +- drop integrated 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch +- drop integrated 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch +- drop integrated 0001-Resolves-rhbz-681159-bandaid-for-crash.patch +- drop integrated 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch +- drop integrated 0001-install-high-resolution-icons.patch +- drop integrated 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch +- drop integrated 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch +- drop integrated 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch +- drop integrated 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch +- drop integrated libreoffice-fdo33947.sd.print.crash.patch +- drop integrated 0001-add-cairo_ft_font_face_create_for_pattern-wrapper.patch +- drop integrated 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch +- drop integrated 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch +- drop integrated 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch +- drop integrated 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch +- drop integrated 0001-beware-of-invalidated-iterator.patch +- drop integrated rhbz680766.fix-mdds-crash.patch +- drop integrated 0001-Resolves-rhbz-684580-X-and-strike-through-escapes-ra.patch +- drop integrated 0001-set-mime-types-on-flat-xml-filters.patch +- Fix spec file for LO 3.4 +- New version 3.4.1.3 +- Remove old old old sources +- Remove merged P37 +- Update to version 3.3.3.1 + +* Sun May 29 2011 dmorgan 3.3.2.2-14.mga1 ++ Revision: 100652 +- Move autocorr-en and hyphen-en as Suggests ( were Requires) + +* Sun May 15 2011 mikala 3.3.2.2-13.mga1 ++ Revision: 99165 +- Add missing \ +- Add an obsolete & provide on libreoffice-help-lang to ease upgrade from mandriva + +* Sun May 01 2011 blino 3.3.2.2-12.mga1 ++ Revision: 94096 +- fix langpack and help packages names for pt, pt_BR, zh_CN and zh_TW + so that they can be expanded by clean-rpmsrate (do not use dash in + lang suffix, #388) +- allow -U langpack option to be used even if -u is specified + (so that both locales-br and locales-fr are required for breton) + + + dmorgan + - Provide templates for Breton ( mgabz #1029) + +* Wed Apr 27 2011 tv 3.3.2.2-11.mga1 ++ Revision: 91953 +- fix file list: add sh help pack + + + blino + - fix build by removing double declaration of breton lang and help packs (titypo) + + + dmorgan + - Remove he help + - Remove wrong langs + - Cy has no help + - Fix typo + - Add More translations + - Remove fa from help packages + - Fix typo + - Fix typo + - More fixes for the help packages + - Help packages will be named libreoffice-help-* + - Fix typo in file list + Add debug ( if it fails ) + - Fix typo + - Try to fix build of the help package + - Bump release + - fix macros + - Try to create help packages + - Remove unneeded %%post, they are already handled by filetriggers ( Anssi) + + + anssi + - add Provides on openoffice.org to libreoffice metapackage + - add libreoffice meta-package requiring the main programs and have it + obsolete openoffice.org meta-package + +* Sat Apr 23 2011 dmorgan 3.3.2.2-10.mga1 ++ Revision: 89866 +- backport for the locales fix +- Revert to LO 3.3.2.2 +- make en langpack to require hyphen-en +- make en langpack to require autocorr-en +- make en langpack to require hunspell-en + +* Fri Apr 22 2011 boklm 3.3.99.1-1.mga1 ++ Revision: 89767 +- add locales-xx as require on libreoffice-langpack-xx + + + dmorgan + - Really fix file list ( Try #666 ) + - Sync configure with fedora + - Fix rm + - Fix file list ( try #6 ) + - Fix file list ( try #4 ) + - Fix file list ( try #3) + - Fix typo + - Apply patch16 cleanly + - Sync with fedora ( fixes in build and translations) + - Fix configure + - Add hsqldb as buildrequire + - Fix patch12 + - rediff patches + - Update patch4 + - Fix BR + - Update to 3.4 Beta 1 + Sync with fedora : + - 3.4 beta1 + - drop openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch + in favour of ooosplash + - drop openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch + because components are passively registered now + - drop integrated openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch + - drop integrated turn-script-providers-into-extensions.patch + - drop integrated 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch + - drop integrated 0001-free-ctxt-after-taking-lastError-details.patch + - drop integrated 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch + - drop integrated libreoffice-gcc4.6.0.patch + - drop integrated 0001-fexceptions-fexceptions.patch + - drop integrated 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch + - drop vbahelper.visibility.patch + - drop integrated 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch + - drop integrated 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch + - drop integrated 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch + - drop integrated 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch + - drop integrated 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch + - drop integrated 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch + - drop integrated 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch + - drop integrated 0001-Resolves-rhbz-681159-bandaid-for-crash.patch + - drop integrated 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch + - drop integrated 0001-install-high-resolution-icons.patch + - drop integrated 0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch + - drop integrated 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch + - drop integrated 0001-Resolves-rhbz-682621-better-resizing-of-overtall-gly.patch + - drop integrated 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch + - drop integrated libreoffice-fdo33947.sd.print.crash.patch + - drop integrated 0001-add-cairo_ft_font_face_create_for_pattern-wrapper.patch + - drop integrated 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch + - drop integrated 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch + - drop integrated 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch + - drop integrated 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch + - drop integrated 0001-beware-of-invalidated-iterator.patch + - drop integrated rhbz680766.fix-mdds-crash.patch + - drop integrated 0001-Resolves-rhbz-684580-X-and-strike-through-escapes-ra.patch + - drop integrated 0001-set-mime-types-on-flat-xml-filters.patch + - drop integrated 0001-add-flat-xml-types-to-.desktop-files-etc.patch + - drop integrated libreoffice-fdo31271.icu.patch + + + misc + - fix file list + +* Sat Apr 16 2011 dmorgan 3.3.2.2-9.mga1 ++ Revision: 86118 +- Fix ure to not require java anymore +- Fix require exception +- Fix conflicts ( mikala) +- Move some obsoletes from core to java-commont + +* Fri Apr 15 2011 dmorgan 3.3.2.2-8.mga1 ++ Revision: 85660 +- Create a java-common package + +* Wed Apr 13 2011 dmorgan 3.3.2.2-7.mga1 ++ Revision: 84787 +- Move %%{ureinstdir}/lib/libjvm*.so* in core +- Only suggests %%name-ure + +* Wed Apr 13 2011 dmorgan 3.3.2.2-6.mga1 ++ Revision: 84402 +- Move libofficebean.so to ure package + Add conflict to ease update + +* Mon Apr 11 2011 dmorgan 3.3.2.2-5.mga1 ++ Revision: 83487 +- Fix Breton language pack as there is no Hyphen-br +- Fix groups + +* Sun Apr 10 2011 dmorgan 3.3.2.2-4.mga1 ++ Revision: 82733 +- Only fix base desktop file for now +- Disable patch44 ( as we removed patches 45 and 46 ) +- Do not use patch 45/46, i will investigate later +- Do not requires devel(libstlport_gcc) +- Make jre optionnal +- backport desktop files fixes from openoffice package +- Add fedora patches (Resolves: rhbz#680766 crash in mdds) + + + tv + - there's no hyphen for br + +* Thu Apr 07 2011 tv 3.3.2.2-3.mga1 ++ Revision: 81640 +- enable br langpack + +* Sun Mar 27 2011 dmorgan 3.3.2.2-2.mga1 ++ Revision: 78202 +- Rebuild against new poppler + +* Fri Mar 25 2011 dmorgan 3.3.2.2-1.mga1 ++ Revision: 77522 +- Do not apply42 as it need patch41 +- Disable patch41, which crash when fast scrolling +- Revert previous commit now that redland is fixed +- Try to fix buildrequires +- Change openoffice.org-voikko require to libreoffice-voikko +- Update to version 3.3.2.2 +- Fix group + +* Fri Mar 18 2011 dmorgan 3.3.1.2-7.mga1 ++ Revision: 74268 +- Obsolete openoffice.org-help-en_US and openoffice.org-help-en_GB + +* Fri Mar 18 2011 dmorgan 3.3.1.2-6.mga1 ++ Revision: 73904 +- More obsolete to easy upgrade +- Add fedora patches: + - Resolves: rhbz#681159 crash in writer + - Resolves: rhbz#672818 crash in writer + - Resolves: fdo#33701 ensure node outlives path + - Resolves: rhbz#681738 crash on writing config post-main + - install 128x128 px icons + - Resolves: rhbz#682716 pa-IN isn't handled well by fontconfig + - Resolves: rhbz#682621 better resizing of overtall glyphsubs + - Related: rhbz#684477 make sure this is thread safe + - Resolves: rhbz#684620 crash with NULL pTableBox + - Resolves: fdo#33947 sd print crash + - Resolves: rhbz#680460 honour lcdfilter and subpixeling + +* Wed Mar 16 2011 dmorgan 3.3.1.2-5.mga1 ++ Revision: 72319 +- More upgrade fixes + +* Wed Mar 16 2011 dmorgan 3.3.1.2-4.mga1 ++ Revision: 72280 +- Try to fix upgrade +- Try to fix upgrade +- Fc patch: Resolves: rhbz#681159 crash in writer +- Reapply patches, previous error was because of iurt timeout + +* Sat Mar 12 2011 dmorgan 3.3.1.2-3.mga1 ++ Revision: 68347 +- Disable patches 7 8 and 27 as i have a build error i did not had before +- Fix patches +- Fix patch6 +- Re enable languages +- Give a try without af localization +- Give a try to langpack + +* Mon Feb 21 2011 dmorgan 3.3.1.2-1.mga1 ++ Revision: 55867 +- Do not apply patch27, i will rediff it later +- Update to 3.3.1.2 +- Add fedora patches : + - Resolves: rhbz#674330 dereference of NULL mpBase + - Resolves: rhbz#678284 Calc crashes during cell select with keys + +* Fri Feb 18 2011 dmorgan 3.3.1.1-1.mga1 ++ Revision: 53946 +- BuildRequires fontpackages-devel not fontpackages +- Add fontpackages as BuildRequire +- Do not build languages for now +- Remove debug +- Build with Werror_cflags %%nil +- Comment patch7 and 8, will be rediff later +- Rediff patch 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch + Use default fuzz 2 +- Add fedora patches +- New version 3.3.1 rc +- Fix dejavu requires +- Add patch to fix compilation +- FIx BuildRequires +- FIx BuildRequires +- DO not apply patches 20 21 for the moment +- Comment libtextcat-devel for now +- Add missing patch +- Fix groups +- Remove commented buildrequires + Comment missing requires +- Rediff and Enable patch4 +- Use %%qt4dir +- Fix kde and qt path +- add libreoffice-fdo32561.comphelper.patch ( from fc ) +- Adda a fedora patch to build against gcc 4.6 +- Backport commits from fedora +- Enable back the "touch" part +- Enable and rediff patch 9 +- Rediff and enable patch 10 +- Enable patches 11 -> 13 +- Enable patch 14 +- Enable patches 15 -> 18 +- Fix BuildRequires for mageia + Comment patches that need to be rediff +- Rediff patches 5-6 - imported package libreoffice - + Oden Eriksson - - fix deps (libwpd-devel[>= 0.9.0])) - - more debug package deactivation magic - - sync yet again with what's in cooker (duh!) - - try to fix the build with iurt - - avoid downloading all the sources (duh!) - - build against system graphite2 and textcat libs - - really use system libwpd, libwpg and libwps libraries - - use system python-translate - - reapply -r682801 (fwang) and add more virtual provides - - don't pull libdbcxx >= 4.2.5-4mdk in vain - - sync with libreoffice-3.4.2-2.src.rpm - - sync with libreoffice-3.4.2-1.src.rpm from 2011 - - sync with libreoffice-3.3.2-1.src.rpm in cooker - - fix deps (libdbcxx) - + Funda Wang - - use virtual provides - - -* Sun Sep 18 2011 Oden Eriksson 1:3.4.2-1 -- don't pull libdbcxx >= 4.2.5-4mdk in vain - -* Mon Sep 12 2011 Rafael Cabral 1:3.4.2-2-mdv2011.0 -- add --with-system-stdlibs, fixes #64224 -- remove clipart-openclipart requires, fixes #63634 - -* Thu Aug 11 2011 Rafael Cabral 1:3.4.2-1mdv2011.0 -- Version update to 3.4.2 -- drop lirebreoffice-build tarball as all ooo-build/go-ooo patches - has been integrated (main change from 3.3 branch to 3.4 in terms of packaging) -- add --without-fonts as we dont ship fonts in LibreOffice -- add vbahelper.visibility.patch to solve build issues -- drop patches are not needed anymore: - mdv-package-ooo.patch - mdv-build-apply.patch - mdv-fpermissiveflag.diff - libreoffice-gcc4.6.diff - mdv-db51check.diff -- remove pt_AO l10n is not supported -- remove help pkgs are not supported: help-ta, help-zu, help-pt_AO - help-cy, help-ar, help-af and help-br -- files *_list.txt were to file-lists dir -- *_list.txt packaging fixes are moved from mdv-package-ooo.patch to - the end of the \%%install secion -- libreoffice tarball sources are directly extracted in the prep -- autogen.sh script is not executed anymore as that is now valid - only for plataforms -- drops openoffice.org.csh and openoffice.org.sh scripts -- add Mandriva Rosa desktop icons -- general spec clean up - -* Sat Apr 30 2011 Rafael Cabral 1:3.3.2-1mdv2011.0 -- Version update to 3.3.2 -- Disable system beanshell -- Disable clipart-openclipart -- Fix db5.1 build checking: mdv-db51check.diff - -* Mon Feb 07 2011 Rafael Cabral 3.3.0-1mdv2011.0 -- LibreOffice 3.3.0 release. -- Changed OpenOffice.org name to LibreOffice (Names, Summary and Description) -- Removed epochs from provides,requires,sugests - -* Mon Dec 27 2010 Rafael Cabral 0:3.2.1-0.1mdv2010.1 -- ooo-build 3.2.1 official release (3.2.1.4 bug fix) -- fixes #59317 (unhides status bar itens, applies Novell patch mentioned - on its bugzilla #567886, comment #21) -- enables ubuntu-javadlx.diff ooo-build patch in order to advises user to - install ooo-java-common package or either remove javasettings_Linux_*.xml -- fixes #61901 (viewing OOo documents on Firefox 64bits, some docs still - make firefox does not open) -- file sun-presentation-minimizer.oxt renamed to presentation-minimizer.oxt - -* Fri Oct 29 2010 Rafael Cabral 0:3.2-4.1mdv2010.1 -- security fixes, using ooo-build hotfixes: - CVE2010-0395 - openoffice.org-3.2.1.pyuno-cve2010-0395.diff - CVE2010-2935-2936 - SA40775-3.1.1-cve2010-2935-2936.diff - -* Mon Apr 19 2010 Rafael Cabral 0:3.2-3mdv2010.1 -- ooo-build 3.2 official release (3.2.0.9 bug fix) - -* Fri Mar 26 2010 Rafael Cabral 0:3.2-2mdv2010.1 -- ooo-build 3.2 official release (3.2.0.8 bug fix) -- build against icu44 and change requires to icu44 - -* Fri Mar 12 2010 Rafael Cabral 0:3.2-1mdv2010.1 -- ooo-build 3.2 official release (3.2.0.7 bug fix) -- fix presenter-screen extension typo in the upgrading logic - -* Wed Mar 03 2010 Rafael Cabral 0:3.2-rc5.1mdv2010.1 -- back deskto-file-install callings to properly configure desktop files - with X-MandrivaLinux-CrossDesktop - -* Wed Feb 23 2010 Rafael Cabral 0:3.2-rc5.0mdv2010.1 -- ooo-build 3.2 rc5 official release -- add common and core requires on gnome package -- add more strict requires on all packages by requiring the release (#57650) -- typo at the update-alternative command in the l10-pt_BR post section -- rename unopkg3.2 to unopkg as extension packages scriptlets - are not using unopkg_version executable (#57700) -- get rid of the ooo version on desktop files (#57700) -- get rid of the deskto-file-install callings as desktop files are - normally generated during the build process (experimental) -- some spec clean up - -* Wed Feb 10 2010 Rafael Cabral 0:3.2-rc4.0mdv2010.1 -- ooo-build 3.2 rc4 official release -- activates the Firefox plugin -- fixes #56439 (lack of icons in the dolphin context menu) -- fixes #56947 (iaoraqt crash) -- possible fix #57370 (crash when saving on ms formats) -- removes images_oxygen.zip file from common since it is in the - style-oxygen package -- rediff mdv-desktop-japanese.patch -- add: - --with-system-zlib - --with-system-openssl - --with-system-expat - --with-system-libxml - --with-system-python - --with-system-saxon - --with-system-xslt - --with-system-curl - --with-system-vigra - --with-system-neon - --with-system-agg -- remove (old/obsolete): - --with-system-xml-apis - --with-system-xerces - --with-system-xalan - --with-system-xt - --with-system-xmlsec - --with-system-libsvg - --with-system-sablot - --with-system-gcc - --with-system-glitz - --with-system-nas - --enable-java - --enable-gstreamer - --with-firefox - --without-system-mspack - --disable-kde - --enable-kde4 - --without-git - --without-binsuffix - --with-dynamic-xinerama - --enable-access - --enable-split-app-modules - --enable-split-opt-features - --with-db-jar - -* Tue Dec 15 2009 Rafael Cabral 0:3.2-beta3.0mdv2010.1 -- ooo-build 3.2 beta3 official release - -* Fri Nov 27 2009 Rafael Cabral 0:3.2-beta1.1mdv2010.1 -- removes the kde dependency from the core package #55791 -- fixes the crash whenever using file->open on kde4 #52880 - -* Tue Nov 10 2009 Rafael Cabral 0:3.2-beta1.0mdv2010.1 -- ooo-build 3.2 beta1 official release -- remove ooo-build patch help-support-mdv.diff -- remove ooo-build patch mandriva-archflags.diff -- remove ooo-build patch msfontextract.diff -- disable mdv-fix-xdg-work-directory.diff -- disable ooo-build patch sw-header-inclusion.diff -- QT4DIR instead of QTDIR (building requires) -- add support to Portuguese Angola -- fix ISO4217 currency id code for Portuguese Angola (i18npool) - -* Thu Oct 20 2009 Rafael Cabral 0:3.1.1-2mdv2010.0 -- add fashion menu icons -- remove paper-utils require #45804 - -* Thu Oct 15 2009 Rafael Cabral 0:3.1.1-1mdv2010.0 -- new openoffice.org 3.1.1 upstream plus ooo-build 3.1.1.2 -- should solve release criticals bugs #54334 and #54592 - -* Thu Sep 24 2009 Rafael Cabral 0:3.1-5mdv2010.0 -- fix icu40 regression - -* Mon Sep 21 2009 Rafael Cabral 0:3.1-4mdv2010.0 -- remove kernel-source build require -- remove libdb-java build require -- add mesaglu1 build require -- uses libjpeg from system, actually libjpeg7, remove exception require - fixes #53763 -- uses hunspell from system -- fix Setup.xcu.ooo update-alternatives -- add anssi's patches: drop-64bit-naming.patch and - move-to-ooo-and-drop-alternatives.patch to renaming openoffice.org64 - packages to openoffice.org (it is no a requirement maintaining different - names to both archs anymore). Further his last patch changes - ooo-mdvsuffix dir to ooo - keeps easy maintenance - -* Fri Aug 14 2009 Rafael Cabral 0:3.1-3mdv2010.0 -- fix kde dependence bug - -* Wed Aug 12 2009 Rafael Cabral 0:3.1-2mdv2010.0 -- change icu40 require to icu42 since it was built against the last one - (due icu40 requires uneeded space on One product) - -* Fri Jun 26 2009 Rafael Cabral 0:3.1-1mdv2010.0 -- ooo-build 3.1 official release - -* Wed May 06 2009 Rafael Cabral 0:3.1-0.beta6.1mdv2010.0 -- first 3.1 (beta6) ooo-buid upstream -- remains using old 3.0.1 package-ooo -- disable mdv-exceptcxx-include-string.diff (build fix uneeded anymore) -- change all references to bases3.0 to bases3.1 dir via mdvsuffix - -* Fri Mar 20 2009 Rafael Cabral 0:3.0.1-5mdv2009.1 -- fix crash on certain table configurations from Office documents #48629 - backported sw-table-crash-fix-i99564.diff - -* Tue Mar 17 2009 Rafael Cabral 0:3.0.1-4mdv2009.1 -- fix file conflicts in openoffice.org-common and openoffice.org-help-en_US - -* Thu Mar 12 2009 Rafael Cabral 0:3.0.1-3mdv2009.1 -- Upstream maintenance update (ooo-build version 3.0.1.3) -- Patches mdv-xdgmailasmailer.diff, mdv-sysui-disableslack.diff were - integrated in this upstream release -- Changed to new Mandriva splash and about screens -- Added desktop-utils and libxtst6-devel as build requires - -* Tue Mar 03 2009 Rafael Cabral 0:3.0.1-2mdv2009.1 -- Revision 347802 -- split out pdf import extension from common to a new package: - openoffice.org-pdfimport -- new enabled extension packages: - openoffice.org-wiki-publisher - openoffice.org-presenter-screen - openoffice.org-presentation-minimizer -- remove kde-libs from build requires -- change qt3-devel to qt4-devel in build requires since the build - scream about that even we are not using qt things yet. -- rebuild to cooker - -* Fri Feb 05 2009 Rafael Cabral 0:3.0.1-1mdv2009.1 -- Revision 337782 -- New upstream version 3.0.1 (official stable release) - -* Mon Jan 12 2009 Rafael Cabral 0:3.0.1-0.rc1.1mdv2009.0 -- Revision 332829 -- New upstream version 3.0.1 (ooo-build call this release as rc1) -- Changed to use libicu40 from the system (--with-system-icu) -- Rebuild for Python 2.6 -- Fix build (lots of rintf aruments clean up) ooo-build patch buildfix-fmtargs.diff - -* Fri Nov 20 2008 Rafael Cabral 0:3.0-1mdv2009.0 -- Revision 332829 -- ooo-build OpenOffice.org 3.0 based on stable upstream -- Fix OOo Greek crash on start up - #44821 -- PyUno loadComponentFromUrl comes out - regression #45445 -- It doesn't get clipart-openclipart - regression #45196. -- Suggests help-en_US which is default l10n language - releated #44809 -- As suggested xdg-mail as default mailer - #43917 -- Remove misplaced ooobuildtime.log -- PDF-import extension must to work even OOo will be update - -* Fri Oct 03 2008 Frederic Crozat 0:3.0-0.rc2.2mdv2009.0 -- Add epoch to fix upgrade from Mdv 2009 RC2 and allow gnome subpackage to be installed - -* Mon Sep 30 2008 Rafael da Veiga Cabral 3.0-0.rc2.1mdv2009.0 -+ Revision 290159 -+ Using new ooo-build-3.0 svn branch based on OpenOffice.org rc2 -+ Remove svn revision from package name - - Ooo-build has migrated it 3.0 sources to a new stable branch and that svn - revision info doesn't make sense anymore for us and further naming package wasn't - following Mandriva standards as well. -+ Path of Python Uno integration fixed -+ Calc fixes - - Formulas was not being saved - #44032 - - Formulas onto spreadsheets of old OOo versions was not being showed - #44010 -+ Improving build - - exporting nodep, NO_HIDS, MAXPROCESS -+ Spec clean ups - -* Mon Sep 22 2008 Rafael da Veiga Cabral 3.0svn13581-3mdv2009.0 -+ Revision 287960 -- New menu icons - #43937 -- New mime types icons -- Rename desktop icons file name - #43922 -- Calc hangs on sorting (reversed sc-sort-cell-note-position.diff) - #43932 -- Added conflicts on common package with gnome why libvclplug_gtkli.so -has been moved - #43920 - -* Mon Sep 01 2008 Rafael da Veiga Cabral 3.0svn13581-2mdv2009.0 -+ Revision 271602 -- Change Andromeda theme name to Galaxy - #42801 -- Vendor/Packager filled out -- Split misplaced help files out of l10n packages -- Split misplaced en_US help files out of common to a new package -- Java-common changed to base Suggests -- None writing aids fixed (using system hunspell) - #42885 -- Drop printer-properties-disable patch - #40834 -- Moved librdf.so.0 to provides exception (ksnapshot) - #42927 -- New splash and about banners -- Added PDF Import extension in common package (installed by default) - #42885 -- New ooo-build 3.0.0 version (revision 13581) -- For a better look libvclplug_gtkli.so has been moved to common package - We've got gtk layouts as default -- libraptor.so.1 to provides exceptions (ksnapshot/amarok) - #42927 -- Linking with neon 0.27 - #43368 -- Calc hangs whenever adding a new sheet from Insert menu - #43405 -- Impress and Draw hang by using zoom from menu View - #43384 -- Weak dependency of Mono (mono and libmono0 is now as requires exception) - #43484 -- New user directory changed to .openoffice.org3 (it'd have solve #42800, #41228) -- Default toolbar icon size was changed to small as default to a better look -- libxmlsec1-nss.so.1 and libxmlsec1.so.1 to provides exceptions - -* Mon Aug 04 2008 Rafael da Veiga Cabral 3.0svn13475-1mdv2009.0 -+ Revision 13471 -- New Openoffice.org 3.0 beta 2. - -* Fri Apr 04 2008 Ademar de Souza Reis Jr. 2.4.0.7-1mdv2008.1 -+ Revision -- new ooo-build upstream version: 2.4.0.7 - Closes: #38874 (Some numbers are shown in Eastern-Arabic) - Closes: #39799 (oowriter: broken "idents & spacing" in "format paragraph") - Closes: #39789 (oowriter spellcheck doesn't work) -- hunspell support is upstream, so remove unecessary sources and flags - -* Fri Mar 28 2008 Ademar de Souza Reis Jr. 2.4.0.4-2mdv2008.1 -+ Revision 191275 -- Remove some ghost entries from -common package which were causing it to - own files from the application subpackages (Closes: #38412); -- Since we're installing icons on the system, add %%clean_icon_cache calls - to -common %%post and %%postun sections (spotted by Frederic Crozat); -- Fix icons names on x86_64 .desktop files (Closes: #39508); -- Remove menu entries for "OpenOffice.org" and "Web/Writer". They're not - real applications and we don't have new icons for them (see #26311#c33); -- Minor spec cleanup (XXX comments, etc). - -* Wed Mar 26 2008 Ademar de Souza Reis Jr. 2.4.0.4-1mdv2008.1 -+ Revision 190514 -- New version: 2.4.0.4 (ooo-build 2.4.0.4, ooo 2.4.0-rc6 - same as 2.4.0) -- Added unopkg files (ooo extensions manager) -- New splash screen (Closes: #38720) -- Added OOXML mime-types to .desktop files (Closes: #36465) -- Changed some conflict rules (due to the split) from '= 2.2.1' - to '<= 2.2.1', so that we can upgrade mdv-2007.1 (Closes: #38891) -- Added new icons for both apps and mimetypes (part of #26311) -- Added OpenDocument entries for KDE "create new" context menu - (Closes: #16983) -- minor spec cleanup - -* Fri Mar 14 2008 Ademar de Souza Reis Jr. 2.4.0.3-1mdv2008.1 -+ Revision 187680 -- New version: 2.4.0.3 (ooo-build 2.4.0.3, ooo 2.4.0-rc5) -- Minor spec cleanups - -* Wed Feb 20 2008 Marcelo Ricardo Leitner -- Use system-db and system-boost for both archs, as gengal does not segfault anymore. -- Enabled usage of OpenGL. -- Enabled lockdown system. -- Use tons of java stuff from the system. (beanshell, xml-apis, xerces, xalan and xt) -- Use system sablot. -- Enabled cairo/canvas for x86_64. -- Imported the changelog in the meanwhile, while we don't submit the package through - the buildsystem. -- Do not mark template*.desktop as ghost in the same package we ship it, - otherelse it is not shipped. -- Updated oox and writerfilter to 20080229. -- Suggest java-common at openoffice.org-common, as it may be used by some macros. - -* Tue Feb 19 2008 Marcelo Ricardo Leitner 2.3.99.4-1mdv2008.1 -+ Revision 171536 -- Merged our ooo-build with upstream ones: we submitted all our fixed to upstream. -- New version: 2.3.99.4 -- New ooo-build: 2.3.99.4-20080218 -- Fixed master name for main alterantives. -- Re-enabled mono bindings -- Added new mono files to %%files -- Disabled debug pacakges. -- Updated conflicts tag from -core to -common prior to 2.3.1-1mdv -- Made ooo-dtd-officedocument1.0 not require ooo, and it doesn't require. - Closes: #37559 -- Made openoffice.org suggest ooo-dtd-officedocument1.0. Closes: #37559 -- Added java requires to ooo-base package. -- Removed qstart patch, as we ship it in -gnome package now. -- Added proper obsoletes/conflict for upgrading old -qstart packages. -- Updated oox and writerfilter to 2008-01-29 -- Updated cli_*.dll - -* Thu Jan 10 2008 Marcelo Ricardo Leitner 2.3.1-2mdv2008.1 -+ Revision 147621 -Changes at the spec: -- Split the helps out of l10n packages. -- Added oodraw to alternatives catalog. Closes: #36618 -- Forces compressing payload with lzma/maximum compression(9). -- Fixes to build with icedtea. Thanks to Anssi for helping with this move. -- Add a missing Suggests to tango style at gnome package. Closes: #36519 -Changes from ooo-build tree: -- Do not merge the help listings with l10n ones. - -* Fri Dec 14 2007 Marcelo Ricardo Leitner 2.3.1-1mdv2008.1 -+ Revision 133876 -Changes at the spec: -- New upstream: 2.3.1 Closes: #34236, #34724, #34274 and #35835 -- Fixed alternatives for handling BrOffice support. -- Fixed wrong dependency for libjpeg.so. Closes: #35354 -- Link against internal xmlsec, as linking with the system one is broken. - Closes: #35067 -- Fix wrong require for libjpeg.so at -draw subpackage. Closes: #35354 -- Removed alternatives for handling BrOffice support: we simply don't need it. -- Added update_desktop_database/clean_desktop_database calls to all subpackages - that holds .desktop files. -- Disabled mono bindings, as current cooker mono-devel seems broken. -- Build against system hsqldb. -- Enhanced /etc/profile.d scripts handling regarding multi-arch support. - Closes: #35402 -- Added dependencies to java stuff on ooo-base, as it depends on it. -- Fix alterantives handling for BrOffice support. They were conflicting if you - had installed both 32 and 64b in the same box. -- From guillomovitch: - - bash completion file don't have .sh suffix -Changes from ooo-build tree: -- Enhanced packaging. Closes: #35853 -- Fixed wizards path. Closes: #35619 -- Speed up Hungarian fixes processing. -- Fix msfontextract tools. Closes: #24314 - -* Fri Nov 23 2007 Marcelo Ricardo Leitner 2.3.0.5-2mdv2008.1 -+ Revision 111340 -Changes at the spec: -- Remove support for old menu system. -- Added BrOffice support. -- Moved alternatives scripts to -common package, as it must affect systems - without the main meta-package. -- As now we are using alternatives for the .desktop files, update the desktop - database only after dealing with alternatives. -- Added patch gtk: fixes wrong free commands in OOo. Closes: #34724 -- Converted openintro_mandriva64.bmp to a 24 bit bitmap, as current splash - can't handle anything different than that. -- Using ooo-build tarball from our soft/ repository now. -- Removed patches angola, force_downloads, ooqstart, xdg and wizards, as they - are already merged in the tarball. -- Disable patch firefox-xpcom for now, as seems it can be handled via configure - options. -- Place mdvsuffix in bash_completion and profile.d scripts, so we can have both - archs installed. -- Check if PYTHONPATH is empty and properly set it, thus avoiding including the - current dir on the path. -- Added back support to build without l10n packages (although seems not working - 100%%) -- Our ooo-build 20071122 -- Uncompressed FontOOo -- Merged -evolution and -gtk into -gnome -- Merged -filter-mobiledev into -filter-binfilter -- Splitted -pyuno -- Splitted -testtool -- Moved file listings to ooo-build scripts. -- Fix alternatives handling for BrOffice support -- Fix wrong dependency for libjpeg.so. Closes: #35354 -Changes from ooo-build tree: -- Merged a lot of our patches from the package. -- Also apply patches from sets CairoFonts, CalcSolver, Split and NotDebian. -- Merged some patches from ooo-build upstream, including - gnome-vfs-read-only-smb.diff for our #35183. - -* Mon Nov 05 2007 Marcelo Ricardo Leitner 2.3.0.5-1mdv2008.1 -+ Revision 106021 -- New upstream: 2.3.0.5 (oog-m7) -- Disabled linking against system xmlsec, as it (the linking) is currently - broken. -- Removed patch xmlsec, as it's not used. -- Added conflicts to the previous release, as thousands of files were moved. -- Remove BuildRequires to inkscape: seems to not be needed. -- Removed german dicts lines, as of commit #104173 we don't need it anymore. -- -l10n packages should require openoffice.org-common now, and not the whole - suite. -- Removed BuildRequires for thousands of locale- packages, as they are not - needed. -- Removed support to build the "tiny" langset, as it won't be used. -- Removed all thes/hyph/dict from the package: they should be available by - general packages. -- Updated DicOOo and decompressed it. -- Make out -clipart package require openclipart one. -- Try to avoid urpmi question by making all application packages also require - explicitly -core. -- Do not force requires for freetype, odbc, sndfile and portaudio, as rpm is - getting them automatically. -- Dropped support for < 2007.1 -- Fully disable QA tools for now. We will work on that after release a first - build for cooker. -- Main package should also require -impress module. -- -impress must require -draw -- Added Suggests for the theme styles on gtk/kde packages. -- Puts proper dependencies between the subpackages -- Added libsvg-devel buildrequires. -- Removed patchs neon and neon2: already fixed in upstream. -- Removed patch CVE-2007-2834: already fixed in upstream. -- Updated patch ooqstart -- Enhanced the detection of the number of processors to use by using - RPM_BUILD_NCPUS variable. -- Move the entire gallery collection to openclipart subpackage. -- Move FontOOo and DicOOo from share/dicts/ooo/ to share/dicts/ at least. -- Do not include the whole myspell stuff in OOo again, as we are already - requiring myspell- packages. -- Fixed icecream paths. -- Fixed missing trailing \ on hunspell configure option. -- Do not run configure twice: do not run configure on autogen, as it was being - done without any option. -- Enabled ccache. -- Updated FontOOo - -* Thu Oct 18 2007 Marcelo Ricardo Leitner 2.2.1-4mdv2008.1 -+ Revision: 99960 -- Remove localwidget patch, it off already. -- Rediffed ooqstart patch. -- Fix syntax error in openoffice.org.csh. Closes: #34423 - -* Fri Sep 21 2007 Marcelo Ricardo Leitner 2.2.1-3mdv2008.0 -+ Revision: 95418 -- Fix patch22 order, as used for the build. -- Added patch force_downloads: force downloading of documents from the web - and/or other IOs (KIOs). Closes: #26983 -- Adds back '64' tag to .desktop filenames when it's build on x86_64. Closes: #33825 -- Added support for /etc/profile.d/openoffice.org.{c,}sh. Closes: #33475 -- Updated thes_es_ES. Closes: #33536. -- Updated thes_bg_BG_v2.tar.bz2 and thes_en_US_v2.tar.bz2 in thes-2.tar. - Closes: #33537, #33538 -- Added patch openoffice.org-2.2.1-CVE-2007-2834.patch. Closes: #33824 -- Force enable gstreamer backend. Closes: #27580 -- Fix Icon tag on desktop files. - - + Anssi Hannula - - fix removal of old alternative when mdvsuffix changes - -* Wed Sep 05 2007 Marcelo Ricardo Leitner 2.2.1-2mdv2008.0 -+ Revision: 80050 -- Added neon2 patch. Closes: #25204 -- Implemented .desktop categories changes as requested by #32902 -- Added patch desktop_files: do not versionate stable .desktop files. -- Use ooo-build ver 2.2.1.10110: move on step further on svn version for using - stable libwp*. -- Added requires to fonts-ttf-liberation. -- Forced linking against libneon >= 0.26: linking against 0.24 is even more - unstable (UI freezes). -- Removed patch libwpg: already applied on ooo-build-2.2.1-10110. -- New design for Mandriva 2008.0. -- Added neon patch: closes #32121 - Fixes handling URL's with wierd chars due to new libneon behaviour change. -- Fix path for icu tools. -- Import openoffice.org - - + Anssi Hannula - - require openoffice.org-voikko instead of myspell-hyph-fi in - openoffice.org-l10n-fi for better Finnish support - - fix use_systemboost build option - - + Thierry Vignaud - - convert prereq - - kill file require on update-alternatives - - + Ademar de Souza Reis Jr - - remove PreReq for chkfontpath (apparently a legacy requirement, - since it's not used anywhere) - - change fonts-ttf-vera requirements to fonts-ttf-dejavu - (Dejavu is the preferred default font) - -* Fri Jun 29 2007 Marcelo Ricardo Leitner 2.2.1-1mdv2008.0 -- Updated to 2.2.1 -- Renamed to openoffice.org -- Not using lzma for now -- Enabled SMP usage. -- Dropped support for <= 2006.0 -- Added requires to paper-utils, due to paperconf. -- libwpd, libwpg, libwps, libicu and libmdbtools are now linked externally. -- Added patch xdg: fix complaiment about MultipleArgs on template2.2.desktop -- Added patch libwpg: fix missing config variable SYSTEM_LIBWPG during build - time. -- Added patch kde: moves fps_kde.uno.so to -kde package, otherwise OOo gets - confused about kde/gnome dialogs. -- Added patch ooqstart: fixes ooqstart.desktop exec command line. -- Many fixes for java/x86_64 from Anssi Hannula, including patch - ooo-build-fix-build-java-target-patch - -* Sat Mar 24 2007 Giuseppe Ghibò 2.2.0-4.rc4.1mdv2007.1 -- ooo-build 2.2.0_cvs20070323. -- use oof680-m14 (RC4). - -* Wed Mar 21 2007 Giuseppe Ghibò 2.2.0-3.m13.2mdv2007.1 -- ooo-build 2.2.0_cvs20070321. - -* Mon Mar 19 2007 Giuseppe Ghibò 2.2.0-3.m13.1mdv2007.1 -- Rebuilt against latest clipart-openclipart (fixes bug #29568). -- ooo-build 2.2.0_cvs20070319. -- use system libwpd. - -* Mon Mar 12 2007 Giuseppe Ghibò 2.2.0-2.rc3.2mdv2007.1 -- ooo-build 2.2.0_cvs20070312. -- Removed X-MandrivaLinux-Office-Spreadsheet from base*.desktop (bug #29381). -- Don't use splash screens with transparencies (report by Hélène). - -* Fri Mar 09 2007 Giuseppe Ghibò 2.2.0-2.rc3.1mdv2007.1 -- ooo-build 2.2.0_cvs20070309. -- use oof680-m11 (RC3). - -* Tue Mar 06 2007 Giuseppe Ghibò 2.2.0-2.m10.2mdv2007.1 -- ooo-build 2.2.0_cvs20070306. -- Fixed splash screen. - -* Sat Mar 03 2007 Giuseppe Ghibò 2.2.0-2.m10.1mdv2007.1 -- ooo-build 2.2.0_cvs20070304. -- merged Felipe Arruda's fixes for brazilian .desktop files translations. -- merged Funda Wang patches for VCL.xcu for chinese menus (bug #29026). -- force building with system sane. -- Updated Splash Screens (thanks to Hélène Durosini). - -* Mon Feb 26 2007 Giuseppe Ghibò 2.2.0-1mdv2007.1 -- ooo-build 2.2.0_cvs2007025. -- renamed to *go-ooo to distinguish from main openoffice.org. - -* Sat Feb 24 2007 Giuseppe Ghibò 2.1.0-5mdv2007.1 -- removed mimelnk subpackage -- ooo-build 2.1.6_cvs20070224 (fix problem when saving in PPT). -- added update-alternatives for ooffice links into %%{_bindir}. -- moved docdir (to allow coexisting between i586 and x86_64 packages). - -* Fri Feb 16 2007 Giuseppe Ghibò 2.1.0-4mdv2007.1 -- ooo-build 2.1.6_cvs20070216. -- Removed Patch8 (merged upstream). -- Removed Patch9 (merged upstream). -- Rebuilt Patch10 (partially merged upstream). - -* Mon Feb 12 2007 Giuseppe Ghibò 2.1.0-3mdv2007.1 -- Updated Source15 (updates for de_DE, it_IT, pl_PL, - new thesaurus for pt_PT, nb_NO, ru_RU). - -* Sat Feb 10 2007 Giuseppe Ghibò 2.1.0-2mdv2007.1 -- ooo-build 2.1.5_cvs20070210. -- Added Patch7 for serializer.jar for problems with gcj. - -* Thu Feb 08 2007 Giuseppe Ghibò 2.1.0-1mdv2007.1 -- ooo-build 2.1.3_cvs20070208. -- use 2.1 for mdvsuffix. -- Removed Patch5 (no longer needed). -- OpenOffice 2.1.0. -- Added Patch7 (temporary disable patch for chinese, as it - doesn't apply anymore and need to be rediffed). -- Added BuildConflicts for libportaudio2 (Florian Hubold). - -* Tue Jan 30 2007 Giuseppe Ghibò 2.0.4-4mdv2007.1 -- ooo-build 2.0.4.14_cvs20070130. - -* Mon Jan 29 2007 Giuseppe Ghibò 2.0.4-3mdv2007.0 -- BuildRequires for libportaudio0-devel instead libportaudio-devel - (libportaudio2-devel is broken?). - -* Thu Jan 04 2007 Vincent Danen 2.0.4-2.1mdv2007.0 -- build for updates, includes the fix for CVE-2006-5870 - -* Wed Dec 20 2006 Giuseppe Ghibò 2.0.4-2mdv2007.0 -- added mime-types 'application/vnd.ms-works;application/x-msworks-wp; - zz-application/zz-winassoc-wps' to writer*desktop (bug #27616). -- cosmetics to the SPEC file. - -* Wed Dec 20 2006 Giuseppe Ghibò 2.0.4-1mdv2007.0 -- OpenOffice to 2.0.4. -- ooo-build 20061220 cvs. - -* Tue Sep 19 2006 Giuseppe Ghibò 2.0.3-6mdv2007.0 -- ooo-build 20060919 cvs: fix cjk fonts (bug #22018, #25701). - -* Fri Sep 15 2006 Giuseppe Ghibò 2.0.3-5mdv2007.0 -- Rebuilt against mozilla-firefox 1.5.0.7. - -* Thu Sep 14 2006 Giuseppe Ghibò 2.0.3-4mdv2007.0 -- Changed .desktop entries categories according to bug #25641. -- Fixed splash screen (ooo-build 20060914 cvs). - -* Mon Sep 11 2006 Giuseppe Ghibò 2.0.3-3mdv2007.0 -- use %%mklibname for unixODBC (from Gwenole). -- added mk in language list. -- fixed csh path in setsdk_unix.csh script. -- Updated FontOOo.sxw wizard to release 1.6. -- Updated DicOOo.sxwd wizard to release 1.6.1. -- Removed Patch5,6 (unused). -- Removed Patch7, merged ooo-build upstream (ooo-build 2.0.3-20060911). -- Added mimetypes for old OpenOffice formats (missed in kdelibs-common), - Source53 and mimelnk subpackage. -- Removed kaffe from "Conflicts" (seems not conflicting in runtime) - (from D.Walluck). - -* Mon Aug 21 2006 Giuseppe Ghibò 2.0.3-2mdv2007.0 -- ooo-build 20060821 cvs. -- Merged Anssi Hannula's fixes (and added -devel and -devel-doc subpackages). -- Added Patch7 for dbus-0.91. - -* Thu Jul 06 2006 Giuseppe Ghibò 2.0.3-1mdv2007.0 -- Release 2.0.3. -- ooo-build 20060706 cvs. - -* Mon Jun 26 2006 Giuseppe Ghibò 2.0.3-0.m6.2mdv2007.0 -- ooo-build 20060624 cvs. - -* Wed Jun 21 2006 Giuseppe Ghibò 2.0.3-0.m6.1mdv2006.0 -- Release oooc680-m6. -- Added Breton language. - -* Mon Jun 19 2006 Giuseppe Ghibò 2.0.3-0.m5.1mdk -- 2.0.3-m5. -- ooo-build 20060619 cvs. -- Removed hunspell subpackage (was empty). -- Renamed package to OpenOffice.org (warly). - -* Sat May 06 2006 Giuseppe Ghibò 2.0.2-6mdk -- ooo-build 2.0.2.9. -- Added Patch6 to allow building with neon library version 0.26. - -* Sat Apr 15 2006 Giuseppe Ghibò 2.0.2-5mdk -- ooo-build 2.0.2.7 (fixes also bug #21869). -- fix typo in Requires when --with systemdb is used (thanks to Richard Houser). -- Disable default cairo rendering for 2006.0 (cause jittering/slow down under - Impress presentations). - -* Sat Mar 18 2006 Giuseppe Ghibò 2.0.2-4mdk -- ooo-build 2.0.2.1. - -* Sat Mar 11 2006 Giuseppe Ghibò 2.0.2-3mdk -- Removed Patch3 (merged into ooo-build upstream). -- ooo-build 2.0.2.cvs20060311. - -* Sat Mar 11 2006 Giuseppe Ghibr 2.0.2-2mdk -- Modified Patch3 (set OOO_EXTRA_ARG to empty string which is - not the same as unset). - -* Thu Mar 09 2006 Giuseppe Ghibò 2.0.2-1mdk -- Release 2.0.2 final. -- ooo-build 2.0.2. - -* Mon Mar 06 2006 Giuseppe Ghibò 2.0.2-0.rc4.3mdk -- moved ooqstart to a standalone subpackage (Patch4). - -* Sat Mar 04 2006 Giuseppe Ghibò 2.0.2-0.rc4.2mdk -- ooo-build 2.0.157.cvs20060304 (fixes bug #21428, IZ#62068). -- Added Patch3 (fixes OOO_EXTRA_ARG env var when it's not set and - called from ooffice2.0 wrapper). - -* Fri Mar 03 2006 Giuseppe Ghibò 2.0.2-0.rc4.1mdk -- ooo-build 2.0.157.cvs20060302. -- Disable direct quickstart call for now. - -* Thu Mar 02 2006 Giuseppe Ghibò 2.0.2-0.m5.2mdk -- ooo-build 2.0.157.cvs20060301. -- Added Conflicts: kaffe. - -* Wed Mar 01 2006 Giuseppe Ghibò 2.0.2-0.m5.1mdk -- Release oob680-m5. - -* Tue Feb 28 2006 Giuseppe Ghibò 2.0.2-0.m4.1mdk -- Release oob680-m4. - -* Mon Feb 06 2006 Giuseppe Ghibò 2.0.1-1mdk -- Release 2.0.1 -- remove --with-system-db-version in configure because doesn't exists anymore. -- added --with-systemdb conditional flag. -- added --with-tiny_langset conditional flag -- ooo-build-2.0.1.3. -- Added --with gcj switch for building with gcj instead of Sun JDK. -- Added Patch1 for supporting .lzma tarballs. -- Added Patch2 to fix bug #19111 (from Eskild Hustvedt). -- Moved Patch5 into ooo-build tree. - -* Sat Jan 14 2006 Giuseppe Ghibò 2.0-7mdk -- fixed bug IZ#47323. -- removed de-DE.tar.bz2 from Source15 not Source14. -- ooo-build-cvs20051026 (fix bug IZ#52047). -- renamed menu name to openoffice.org-2.0 (Gwenole). -- Added bulgarian l10n subpackage. -- ooo-build-cvs20060114. -- Lowered optimization to -O1, as -O2 causes segfaults (with gcc 4.0.2-1mdk) in the - libunosal.so.3 libs from javaldx executable during package building. - -* Thu Oct 20 2005 Giuseppe Ghibò 2.0-1mdk -- 2.0 final. - -* Fri Oct 14 2005 Giuseppe Ghibò 2.0-0.rc3.1mdk -- 2.0-rc3. - -* Mon Sep 26 2005 Giuseppe Ghibò 2.0-0.m129.3mdk -- ooobuild cvs 20050924. -- moved libsndfile.so, libportaudio.so, libdb-4.2.so, libmyspell.so, - libstlport_gcc.so to provides exceptions (Pascal Terjan). - - -* Sat Sep 24 2005 Giuseppe Ghibò 2.0-0.m129.2mdk -- ooobuild cvs 20050921. -- Removed Patch4 (fixed in upstream). -- Added libdb-4.2.so, libmyspell.so, libstlport_gcc.so to require exceptions - (bug #17262). - -* Sat Sep 17 2005 Giuseppe Ghibò 2.0-0.m129.1mdk -- 1.9.129. -- ooobuild cvs 20050918. -- Removed Patch0->3 (merged upstream). -- Added Patch4 (disable patch for i54709), because it doesn't apply correctly. -- White progressbar. -- Added Gwenole Patches for having OOo2 working under X86_64 in 32bit mode - (Patch5). - -* Wed Sep 14 2005 Giuseppe Ghibò 2.0-0.m128.5mdk -- Fix bug #18581 (libportaudio). -- Move libkab1.so to -kde package (pterjan). - -* Wed Sep 14 2005 Giuseppe Ghibò 2.0-0.m128.4mdk -- ooobuild cvs 20050914. - -* Wed Sep 14 2005 Giuseppe Ghibò 2.0-0.m128.3mdk -- added Patch0 for spellchecker -- Updated Source16. - -* Mon Sep 12 2005 Giuseppe Ghibò 2.0-0.m128.2mdk -- binfilters, mono. - -* Thu Sep 08 2005 Giuseppe Ghibò 2.0-0.m128.1mdk -- 1.9.128. - -* Mon Jul 25 2005 Giuseppe Ghibò 2.0-0.m121.1mdk -- 1.9.121. - -* Mon Jul 11 2005 Giuseppe Ghibò 2.0-0.m116.1mdk -- 1.9.116. - -* Mon Jul 11 2005 Giuseppe Ghibò 2.0-0.m114.1mdk -- 1.9.114. - -* Fri Jun 24 2005 Giuseppe Ghibò 2.0-0.m110.1mdk -- Updated ooo-build to cvs 20050624. - -* Thu Jun 23 2005 Giuseppe Ghibò 2.0-0.m108.2mdk -- Updated ooo-build to cvs 20050623 (fixes problem with - icon sets). - -* Wed Jun 22 2005 Giuseppe Ghibò 2.0-0.m108.1mdk -- 1.9.110. - -* Wed Mar 23 2005 Giuseppe Ghibò 1.1.4-1mdk -- 1.1.4. - -* Fri Jan 21 2005 Giuseppe Ghibò 1.1.3-1mdk -- Initial release. +* Thu Jan 20 2011 Caolán McNamara 3.3.0.4-1 +- next release candidate +- drop integrated 0001-fix-presenter-screens-description.xml-build.patch + +* Tue Jan 18 2011 Caolán McNamara 3.3.0.3-2 +- backport fix to get presenter screen working +- make handling busted extensions more robust + +* Wed Jan 12 2011 Caolán McNamara 3.3.0.3-1 +- latest version +- drop integrated 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch +- drop integrated 0001-Avoid-double-paste-when-pasting-text-into-cell-comme.patch +- drop integrated 0001-Resolves-rhbz-660342-Undo-Redo-crash-with-postits.patch +- drop integrated 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch + +* Thu Jan 06 2011 Caolán McNamara 3.3.0.2-5 +- Resolves: rhbz#666088 don't crash on clean up of search cache + +* Wed Jan 05 2011 Lukas Tinkl 3.3.0.2-4 +- create a KDE integration subpackage + +* Mon Jan 03 2011 David Tardon 3.3.0.2-3 +- rebuild with new poppler + +* Wed Dec 22 2010 Caolán McNamara 3.3.0.2-2 +- Resolves: rhbz#663724 fdo32572-sc-dont-double-paste.patch +- Resolves: rhbz#660342 Undo/Redo crash with postits + +* Tue Dec 21 2010 Caolán McNamara 3.3.0.2-1 +- latest version + +* Sat Dec 18 2010 Caolán McNamara 3.3.0.1-4 +- Resolves: rhbz#663857 font color missing in transitions + +* Wed Dec 15 2010 Rex Dieter - 3.3.0.1-3 +- rebuild (poppler) + +* Wed Dec 15 2010 Caolán McNamara 3.3.0.1-2 +- Fix up some doc imports + +* Sun Dec 05 2010 Caolán McNamara 3.3.0.1-1 +- release candidate 1 +- drop integrated qstart.dont-forceenabled-on-post-reg-restart.patch +- drop integrated exit.quickstarter.when.deleted.patch +- drop integrated 0001-destroydesktop.in.timeout.patch +- drop integrated openoffice.org-3.3.0.rhbz657541.join-paragraphs.patch + +* Sat Nov 27 2010 Caolán McNamara 3.2.99.3-2 +- Resolves: rhbz#610103 exit quickstarter when libs deleted +- Resolves: rhbz#652695 release desktop in timeout +- Resolves: rhbz#657541 don't crash during processing of auto. styles + when joining paragraphs (dtardon) + +* Thu Nov 18 2010 Caolán McNamara 3.2.99.2-5 +- Resolves: rhbz#649210 add Sinhalese langpack + +* Sun Oct 30 2010 Caolán McNamara 3.2.99.2-4 +- langpack macro hard-coded version number + +* Fri Oct 22 2010 Caolán McNamara 3.2.99.2-3 +- Resolves: xdg632229 gnomeshell app tracking + +* Tue Oct 12 2010 David Tardon 3.2.99.2-2 +- use macros to define auto-correction and language pack subpackages + +* Mon Oct 11 2010 Caolán McNamara 3.2.99.2-1 +- next LibreOffice milestone +- drop integrated openoffice.org-2.3.0.ooo76649.httpencoding.patch +- drop integrated workspace.dtardon03.patch +- drop integrated openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch +- drop integrated workspace.impress195.patch +- drop integrated workspace.srb1.patch +- drop integrated openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch +- drop integrated openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch +- drop integrated openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch +- drop integrated openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch +- drop integrated openoffice.org-3.3.0.ooo111758.sd.xerror.patch +- drop integrated openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch +- drop integrated openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch +- drop integrated openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch +- drop integrated workspace.vcl113.patch +- drop integrated openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch +- drop integrated workspace.cmcfixes77.patch +- drop integrated workspace.vcl114.patch +- drop integrated openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch +- drop integrated workspace.vcl115.patch +- drop integrated workspace.cmcfixes78.patch +- drop integrated openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch +- drop integrated workspace.cmcfixes79.patch +- drop integrated openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch +- drop integrated openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch +- drop integrated openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch +- drop integrated openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch +- drop workspace.gtk3.patch + +* Wed Oct 06 2010 Caolán McNamara 3.2.99.1-2 +- Related: rhbz#639945 pull in review changes + + redland build-fix + + replace awk script + + validate .destop files + +* Wed Sep 29 2010 Caolán McNamara 3.2.99.1-1 +- initial import of the leviathan diff --git a/libreoffice34-gcc462.patch b/libreoffice34-gcc462.patch deleted file mode 100644 index c19e520..0000000 --- a/libreoffice34-gcc462.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- ./framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15 15:08:41.329168423 -0200 -+++ ./framework/source/accelerators/acceleratorcache.cxx 2011-12-15 15:17:59.473190664 -0200 -@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache() - AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) - : ThreadHelpBase(&Application::GetSolarMutex()) - { -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - } - -@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac - // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); - -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - - aWriteLock.unlock(); ---- ./framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938 -0200 -+++ ./framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483 -0200 -@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const :: - // take over all new parameters. - m_xTargetFrame.clear(); - m_xBaseFrame = xBaseFrame ; -- m_lMediaDescriptor = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ m_lMediaDescriptor = tmp; - m_sTarget = sTarget ; - m_nSearchFlags = nSearchFlags ; - m_eFeature = eFeature ; ---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig 2011-12-15 15:08:49.033072112 -0200 -+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx 2011-12-15 15:11:07.209344668 -0200 -@@ -175,6 +175,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000 -+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000 -@@ -185,6 +185,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000 -+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000 -@@ -171,6 +171,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; - ---- ./padmin/source/prtsetup.cxx.orig 2011-12-15 15:09:05.133870823 -0200 -+++ ./padmin/source/prtsetup.cxx 2011-12-15 15:13:55.626239170 -0200 -@@ -813,7 +813,7 @@ extern "C" { - - if( aDialog.Execute() ) - { -- rJobData = aDialog.getSetup(); -+ rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() ); - nRet = 1; - } - ---- ./sfx2/source/doc/guisaveas.cxx.orig 2011-12-15 15:08:58.332955848 -0200 -+++ ./sfx2/source/doc/guisaveas.cxx 2011-12-15 15:12:39.953185212 -0200 -@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co - if ( aFilterName.getLength() ) - m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; - -- aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); -+ aFiltPropsHM << aFilterProps; - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); - } - ---- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000 -+++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000 -@@ -230,7 +230,7 @@ - { - bPreferred = rCopy.bPreferred ; - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash& > (rCopy.lUINames); - sMediaType = rCopy.sMediaType ; - sClipboardFormat = rCopy.sClipboardFormat; - nDocumentIconID = rCopy.nDocumentIconID ; -@@ -298,7 +298,7 @@ - nOrder = rCopy.nOrder ; - sName = rCopy.sName ; - sType = rCopy.sType ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash& > (rCopy.lUINames); - sDocumentService = rCopy.sDocumentService ; - sFilterService = rCopy.sFilterService ; - sUIComponent = rCopy.sUIComponent ; -@@ -405,7 +405,7 @@ - inline Loader& impl_copy( const Loader& rCopy ) - { - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash& > (rCopy.lUINames); - lTypes = rCopy.lTypes ; - return (*this); - } diff --git a/mdv-sysui-disableslack.diff b/mdv-sysui-disableslack.diff deleted file mode 100644 index 9cd9a17..0000000 --- a/mdv-sysui-disableslack.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- sysui/prj/build.lst.old1 2011-08-01 18:41:26.000000000 +0000 -+++ sysui/prj/build.lst 2011-08-01 18:42:37.000000000 +0000 -@@ -13,7 +13,6 @@ - su sysui\desktop\mandriva nmake - u su_dtmdk su_dtshare.u NULL - su sysui\desktop\freedesktop nmake - u su_dtfreedesktop su_dtredhat.u NULL - su sysui\desktop\debian nmake - u su_dtdebian su_dtshare.u NULL --su sysui\desktop\slackware nmake - u su_dtslackware su_dtshare.u NULL - su sysui\desktop\solaris nmake - u su_dtsolaris su_dtshare.u NULL --su sysui\desktop\util nmake - u su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u su_dtslackware.u NULL -+su sysui\desktop\util nmake - u su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u NULL - su sysui\util nmake - all su_util su_dtsolaris.u su_desktop.u su_iconsw.w NULL diff --git a/openoffice.org-2.0.2.rh188467.printingdefaults.patch b/openoffice.org-2.0.2.rh188467.printingdefaults.patch new file mode 100644 index 0000000..45c40aa --- /dev/null +++ b/openoffice.org-2.0.2.rh188467.printingdefaults.patch @@ -0,0 +1,15 @@ +Index: configuration/ppds/SGENPRT.PS +=================================================================== +RCS file: /cvs/external/psprint_config/configuration/ppds/SGENPRT.PS,v +retrieving revision 1.3 +diff -u -p -u -r1.3 SGENPRT.PS +--- openoffice.org.orig/psprint_config/configuration/ppds/SGENPRT.PS 26 Nov 2004 16:10:35 -0000 1.3 ++++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS 30 Aug 2005 11:17:51 -0000 +@@ -58,6 +58,7 @@ + *ColorDevice: True + *DefaultColorSpace: RGB + *LanguageLevel: "2" ++*TTRasterizer: Type42 + + *% --- For None Color or old PostScript(R) printers use following lines --- + *% *ColorDevice: False diff --git a/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch b/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch new file mode 100644 index 0000000..afd33a4 --- /dev/null +++ b/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch @@ -0,0 +1,47 @@ +--- openoffice.org.orig/desktop/scripts/unopkg.sh 2008-01-14 15:55:26.000000000 +0000 ++++ openoffice.org/desktop/scripts/unopkg.sh 2008-02-14 10:52:10.000000000 +0000 +@@ -62,6 +62,33 @@ + ;; + esac + ++isnotuser=0 ++for arg in $@ ++do ++if [ "$arg" = "--shared" -o "$arg" = "--bundled" ]; then ++ isnotuser=1 ++fi ++done ++if [ $isnotuser -eq 1 ]; then ++ echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY ++ if [ $? -ne 0 ]; then ++ set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' ++ fi ++ echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA ++ if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then ++ set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml' ++ fi ++ echo $@ | grep -q env:UserInstallation ++ if [ $? -ne 0 ]; then ++ INSTDIR=`/bin/mktemp -d --tmpdir unoinstall.XXXXXX` ++ if [ $? -ne 0 ]; then ++ echo "Could not create tmp dir" >&2 ++ exit 1 ++ fi ++ set -- $@ '-env:UserInstallation=file://'$INSTDIR ++ fi ++fi ++ + #collect all bootstrap variables specified on the command line + #so that they can be passed as arguments to javaldx later on + #Recognize the "sync" option. sync must be applied without any other +@@ -110,6 +137,8 @@ + # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS + + # execute binary +-exec "$sd_prog/unopkg.bin" "$@" $JVMFWKPARAMS \ ++"$sd_prog/unopkg.bin" "$@" $JVMFWKPARAMS \ + "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" +- ++if [ -n "$INSTDIR" ]; then ++ rm -rf $INSTDIR ++fi diff --git a/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch b/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch new file mode 100644 index 0000000..b82f4df --- /dev/null +++ b/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch @@ -0,0 +1,141 @@ +From 5316edea6948f3e2a77e4fc68799f67de21fada7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 5 Dec 2011 15:28:19 +0100 +Subject: [PATCH] vertical content overflowing out of cell (#i88341#) + +--- + sc/source/ui/inc/output.hxx | 2 + + sc/source/ui/view/output2.cxx | 66 ++++++++++++++++++++++++++-------------- + 2 files changed, 45 insertions(+), 23 deletions(-) + +diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx +index 72934cf..3a91c14 100644 +--- a/sc/source/ui/inc/output.hxx ++++ b/sc/source/ui/inc/output.hxx +@@ -306,6 +306,8 @@ public: + void DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom); + void DrawFrame(); + ++ bool UseNormalClip(SCROW nCellY, const SfxItemSet* pCondSet); ++ + // with logic MapMode set! + void DrawEdit(sal_Bool bPixelToLogic); + +diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx +index de1506a..5522e69 100644 +--- a/sc/source/ui/view/output2.cxx ++++ b/sc/source/ui/view/output2.cxx +@@ -2818,13 +2818,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) + (ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE); + bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1; + +- // Don't clip for text height when printing rows with optimal height, +- // except when font size is from conditional formatting. +- //! Allow clipping when vertically merged? +- if ( eType != OUTTYPE_PRINTER || +- ( pDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || +- ( rParam.mpCondSet && SFX_ITEM_SET == +- rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) ++ if (UseNormalClip(rParam.mnCellY, rParam.mpCondSet)) + bClip = true; + else + bSimClip = true; +@@ -2859,6 +2853,19 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) + } + + Rectangle aLogicClip; ++ if ( ++ ((nAttrRotate == 9000) || (nAttrRotate == 27000)) && ++ (!(rParam.meOrient==SVX_ORIENTATION_STANDARD && ++ !rParam.mbAsianVertical)) && ++ (!(bClip || bSimClip)) ++ ) ++ { ++ if (UseNormalClip(rParam.mnCellY, rParam.mpCondSet)) ++ bClip = true; ++ else ++ bSimClip = true; ++ } ++ + if (bClip || bSimClip) + { + // Clip marks are already handled in GetOutputArea +@@ -3191,13 +3198,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) + (ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE); + bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1; + +- // Don't clip for text height when printing rows with optimal height, +- // except when font size is from conditional formatting. +- //! Allow clipping when vertically merged? +- if ( eType != OUTTYPE_PRINTER || +- ( pDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || +- ( rParam.mpCondSet && SFX_ITEM_SET == +- rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) ++ ++ if (UseNormalClip(rParam.mnCellY, rParam.mpCondSet)) + bClip = true; + else + bSimClip = true; +@@ -3563,13 +3565,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) + (ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE); + bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1; + +- // Don't clip for text height when printing rows with optimal height, +- // except when font size is from conditional formatting. +- //! Allow clipping when vertically merged? +- if ( eType != OUTTYPE_PRINTER || +- ( pDoc->GetRowFlags( rParam.mnCellY, nTab ) & CR_MANUALSIZE ) || +- ( rParam.mpCondSet && SFX_ITEM_SET == +- rParam.mpCondSet->GetItemState(ATTR_FONT_HEIGHT, true) ) ) ++ if (UseNormalClip(rParam.mnCellY, rParam.mpCondSet)) + bClip = true; + else + bSimClip = true; +@@ -4460,6 +4456,20 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) + rParam.adjustForHyperlinkInPDF(aURLStart, pDev); + } + ++bool ScOutputData::UseNormalClip(SCROW nCellY, const SfxItemSet* pCondSet) ++{ ++ bool bNormalClip = false; ++ // Don't clip for text height when printing rows with optimal height, ++ // except when font size is from conditional formatting. ++ //! Allow clipping when vertically merged? ++ if ( eType != OUTTYPE_PRINTER || ++ ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) || ++ ( pCondSet && SFX_ITEM_SET == ++ pCondSet->GetItemState(ATTR_FONT_HEIGHT, sal_True) ) ) ++ bNormalClip = true; ++ return bNormalClip; ++} ++ + void ScOutputData::DrawEdit(sal_Bool bPixelToLogic) + { + ScFieldEditEngine* pEngine = NULL; +@@ -5168,11 +5178,21 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic) + else + { + // bei gedrehtem Text ist Standard zentriert ++ long nDiff = 0; + if (eHorJust==SVX_HOR_JUSTIFY_RIGHT) +- aLogicStart.X() += nAvailWidth - nEngineWidth; ++ nDiff = nAvailWidth - nEngineWidth; + else if (eHorJust==SVX_HOR_JUSTIFY_CENTER || + eHorJust==SVX_HOR_JUSTIFY_STANDARD) +- aLogicStart.X() += (nAvailWidth - nEngineWidth) / 2; ++ nDiff = (nAvailWidth - nEngineWidth) / 2; ++ ++ if (nEngineWidth > nAvailWidth) ++ { ++ if (nAttrRotate == 9000) ++ nDiff = 0; ++ else if (nAttrRotate == 27000) ++ nDiff = nAvailWidth - nEngineWidth; ++ } ++ aLogicStart.X() += nDiff; + } + } + +-- +1.7.7.3 + diff --git a/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch b/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch new file mode 100644 index 0000000..2b13e4f --- /dev/null +++ b/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch @@ -0,0 +1,187 @@ +From 7e3bdb601c02e60b772e64ec9d11c56881c9a643 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 1 Dec 2011 14:02:07 +0100 +Subject: [PATCH 1/2] #i101274 a directory on command line is silently ignored + +--- + .../source/misc/stillreadwriteinteraction.cxx | 1 + + ucbhelper/source/client/content.cxx | 75 ++++++++++++++++++++ + 2 files changed, 76 insertions(+), 0 deletions(-) + +diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx +index 124564d..506f31c 100644 +--- a/comphelper/source/misc/stillreadwriteinteraction.cxx ++++ b/comphelper/source/misc/stillreadwriteinteraction.cxx +@@ -96,6 +96,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction: + bAbort = ( + (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED ) + || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ++ || (exIO.Code == css::ucb::IOErrorCode_NO_FILE ) + || (exIO.Code == css::ucb::IOErrorCode_NOT_EXISTING ) + #ifdef MACOSX + // this is a workaround for MAC, on this platform if the file is locked +diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx +index 676acd5..4a599c9 100644 +--- a/ucbhelper/source/client/content.cxx ++++ b/ucbhelper/source/client/content.cxx +@@ -38,6 +38,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -47,6 +48,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -64,6 +67,8 @@ + #include + #include + #include ++#include ++ + #include + #include + #include +@@ -71,6 +76,10 @@ + #include + #include + #include ++#include ++#include ++ ++#include + + using namespace com::sun::star::container; + using namespace com::sun::star::beans; +@@ -373,6 +382,54 @@ static Reference< XContent > getContent( + return Reference< XContent >(); + } + ++namespace ++{ ++ ++void ++lcl_displayMessage( ++ const Reference& rEnvironment, ++ const rtl::OUString& rUri) ++{ ++ // Create exception ++ const Reference xCPM( ++ getContentBroker(true)->getContentProviderManagerInterface()); ++ const PropertyValue aUriProperty( ++ rtl::OUString::createFromAscii("Uri"), ++ -1, ++ makeAny(getSystemPathFromFileURL(xCPM, rUri)), ++ PropertyState_DIRECT_VALUE) ++ ; ++ Sequence lArguments(1); ++ lArguments[0] <<= aUriProperty; ++ const InteractiveAugmentedIOException xError( ++ rtl::OUString(), ++ 0, ++ InteractionClassification_ERROR, ++ IOErrorCode_NO_FILE, ++ lArguments) ++ ; ++ ++ // Create interaction request ++ std::auto_ptr aRequest( ++ new ucbhelper::SimpleInteractionRequest(makeAny(xError), CONTINUATION_APPROVE)); ++ { ++ Reference xContinuation( ++ new ::ucbhelper::InteractionApprove(aRequest.get())); ++ Sequence > lContinuations(1); ++ lContinuations[0].set(xContinuation); ++ aRequest->setContinuations(lContinuations); ++ } ++ ++ Reference xInteraction(rEnvironment->getInteractionHandler()); ++ if (xInteraction.is()) ++ { ++ Reference xRequest(aRequest.release()); ++ xInteraction->handle(xRequest); ++ } ++} ++ ++} ++ + //========================================================================= + //========================================================================= + // +@@ -890,7 +947,10 @@ Reference< XInputStream > Content::openStream() + throw( CommandAbortedException, RuntimeException, Exception ) + { + if ( !isDocument() ) ++ { ++ lcl_displayMessage(m_xImpl->getEnvironment(), getURL()); + return Reference< XInputStream >(); ++ } + + Reference< XActiveDataSink > xSink = new ActiveDataSink; + +@@ -915,7 +975,10 @@ Reference< XInputStream > Content::openStreamNoLock() + throw( CommandAbortedException, RuntimeException, Exception ) + { + if ( !isDocument() ) ++ { ++ lcl_displayMessage(m_xImpl->getEnvironment(), getURL()); + return Reference< XInputStream >(); ++ } + + Reference< XActiveDataSink > xSink = new ActiveDataSink; + +@@ -940,7 +1003,10 @@ Reference< XStream > Content::openWriteableStream() + throw( CommandAbortedException, RuntimeException, Exception ) + { + if ( !isDocument() ) ++ { ++ lcl_displayMessage(m_xImpl->getEnvironment(), getURL()); + return Reference< XStream >(); ++ } + + Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer; + +@@ -965,7 +1031,10 @@ Reference< XStream > Content::openWriteableStreamNoLock() + throw( CommandAbortedException, RuntimeException, Exception ) + { + if ( !isDocument() ) ++ { ++ lcl_displayMessage(m_xImpl->getEnvironment(), getURL()); + return Reference< XStream >(); ++ } + + Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer; + +@@ -990,7 +1059,10 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink ) + throw( CommandAbortedException, RuntimeException, Exception ) + { + if ( !isDocument() ) ++ { ++ lcl_displayMessage(m_xImpl->getEnvironment(), getURL()); + return sal_False; ++ } + + OpenCommandArgument2 aArg; + aArg.Mode = OpenMode::DOCUMENT; +@@ -1013,7 +1085,10 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream ) + throw( CommandAbortedException, RuntimeException, Exception ) + { + if ( !isDocument() ) ++ { ++ lcl_displayMessage(m_xImpl->getEnvironment(), getURL()); + return sal_False; ++ } + + OpenCommandArgument2 aArg; + aArg.Mode = OpenMode::DOCUMENT; +-- +1.7.7.3 + diff --git a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch new file mode 100644 index 0000000..290b8c7 --- /dev/null +++ b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch @@ -0,0 +1,78 @@ +Index: bin/modules/installer/scriptitems.pm +=================================================================== +RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v +retrieving revision 1.17 +diff -u -p -r1.17 scriptitems.pm +--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17 ++++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000 +@@ -1066,7 +1066,7 @@ + } + else + { +- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file ++ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file + } + + push( @installer::globals::logfileinfo, $infoline); +@@ -1144,7 +1144,7 @@ + } + else + { +- $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file ++ $infoline = "WARNING: Source for $$searchfilenameref not found!\n"; # Important message in log file + } + + push( @installer::globals::logfileinfo, $infoline); +@@ -1356,11 +1356,10 @@ + + if ( ! $installer::globals::languagepack && !$installer::globals::helppack) + { +- $infoline = "ERROR: Removing file $filename from file list.\n"; ++ $infoline = "WARNING: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + +- push(@missingfiles, "ERROR: File not found: $filename\n"); +- $error_occurred = 1; ++ push(@missingfiles, "WARNING: File not found: $filename\n"); + + next; # removing this file from list, if sourcepath is empty + } +@@ -1368,11 +1367,10 @@ + { + if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) + { +- $infoline = "ERROR: Removing file $filename from file list.\n"; ++ $infoline = "WARNING: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + +- push(@missingfiles, "ERROR: File not found: $filename\n"); +- $error_occurred = 1; ++ push(@missingfiles, "WARNING: File not found: $filename\n"); + + next; # removing this file from list, if sourcepath is empty + } +@@ -1390,11 +1388,10 @@ + { + if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) + { +- $infoline = "ERROR: Removing file $filename from file list.\n"; ++ $infoline = "WARNING: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + +- push(@missingfiles, "ERROR: File not found: $filename\n"); +- $error_occured = 1; ++ push(@missingfiles, "WARNING: File not found: $filename\n"); + + next; # removing this file from list, if sourcepath is empty + } +--- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:26.000000000 +0100 ++++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:54.000000000 +0100 +@@ -53,7 +53,7 @@ + ( $installer::globals::packageformat eq "archive" )) + { + $installer::globals::is_simple_packager_project = 1; +- $installer::globals::patch_user_dir = 1; ++ $installer::globals::patch_user_dir = 0; + } + elsif( $installer::globals::packageformat eq "dmg" ) + { diff --git a/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch b/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch new file mode 100644 index 0000000..38b521c --- /dev/null +++ b/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch @@ -0,0 +1,199 @@ +From 36644331aad8382ccab7fb19d7ab3339bbff0c20 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 1 Dec 2011 14:18:09 +0100 +Subject: [PATCH 2/2] #i105784# vcl: improve selection of fallback font by + supplying language hint when none exists + +--- + vcl/generic/fontmanager/fontconfig.cxx | 143 +++++++++++++++++++++++++++++++- + 1 files changed, 141 insertions(+), 2 deletions(-) + +diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx +index 4d02a76..ecd3b5d 100644 +--- a/vcl/generic/fontmanager/fontconfig.cxx ++++ b/vcl/generic/fontmanager/fontconfig.cxx +@@ -89,6 +89,9 @@ using namespace psp; + + #include "sal/alloca.h" + ++#include //unicode::getUnicodeScriptType ++#include //ScriptType ++ + #include + #include + +@@ -747,6 +750,138 @@ static void addtopattern(FcPattern *pPattern, + } + } + ++static const char* pick_sample_language(const sal_uInt32 cCode) ++{ ++ using namespace ::com::sun::star::i18n; ++ ++ static ScriptTypeList aScripts[] = ++ { ++ { UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin }, ++ { UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement }, ++ { UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA }, ++ { UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB }, ++ { UnicodeScript_kGreek, UnicodeScript_kGreek, UnicodeScript_kGreek }, ++ { UnicodeScript_kCyrillic, UnicodeScript_kCyrillic, UnicodeScript_kCyrillic }, ++ { UnicodeScript_kArmenian, UnicodeScript_kArmenian, UnicodeScript_kArmenian }, ++ { UnicodeScript_kHebrew, UnicodeScript_kHebrew, UnicodeScript_kHebrew }, ++ { UnicodeScript_kArabic, UnicodeScript_kArabic, UnicodeScript_kArabic }, ++ { UnicodeScript_kSyriac, UnicodeScript_kSyriac, UnicodeScript_kSyriac }, ++ { UnicodeScript_kThaana, UnicodeScript_kThaana, UnicodeScript_kThaana }, ++ { UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, UnicodeScript_kDevanagari }, ++ { UnicodeScript_kBengali, UnicodeScript_kBengali, UnicodeScript_kBengali }, ++ { UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi }, ++ { UnicodeScript_kGujarati, UnicodeScript_kGujarati, UnicodeScript_kGujarati }, ++ { UnicodeScript_kOriya, UnicodeScript_kOriya, UnicodeScript_kOriya }, ++ { UnicodeScript_kTamil, UnicodeScript_kTamil, UnicodeScript_kTamil }, ++ { UnicodeScript_kTelugu, UnicodeScript_kTelugu, UnicodeScript_kTelugu }, ++ { UnicodeScript_kKannada, UnicodeScript_kKannada, UnicodeScript_kKannada }, ++ { UnicodeScript_kMalayalam, UnicodeScript_kMalayalam, UnicodeScript_kMalayalam }, ++ { UnicodeScript_kSinhala, UnicodeScript_kSinhala, UnicodeScript_kSinhala }, ++ { UnicodeScript_kThai, UnicodeScript_kThai, UnicodeScript_kThai }, ++ { UnicodeScript_kLao, UnicodeScript_kLao, UnicodeScript_kLao }, ++ { UnicodeScript_kTibetan, UnicodeScript_kTibetan, UnicodeScript_kTibetan }, ++ { UnicodeScript_kMyanmar, UnicodeScript_kMyanmar, UnicodeScript_kMyanmar }, ++ { UnicodeScript_kGeorgian, UnicodeScript_kGeorgian, UnicodeScript_kGeorgian }, ++ { UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo }, ++ { UnicodeScript_kEthiopic, UnicodeScript_kEthiopic, UnicodeScript_kEthiopic }, ++ { UnicodeScript_kCherokee, UnicodeScript_kCherokee, UnicodeScript_kCherokee }, ++ { UnicodeScript_kUnifiedCanadianAboriginalSyllabics, ++ UnicodeScript_kUnifiedCanadianAboriginalSyllabics, ++ UnicodeScript_kUnifiedCanadianAboriginalSyllabics }, ++ { UnicodeScript_kKhmer, UnicodeScript_kKhmer, UnicodeScript_kKhmer }, ++ { UnicodeScript_kMongolian, UnicodeScript_kMongolian, UnicodeScript_kMongolian }, ++ { UnicodeScript_kLatinExtendedAdditional, UnicodeScript_kLatinExtendedAdditional, ++ UnicodeScript_kLatinExtendedAdditional }, ++ { UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended }, ++ { UnicodeScript_kHiragana, UnicodeScript_kHiragana, UnicodeScript_kHiragana }, ++ { UnicodeScript_kKatakana, UnicodeScript_kKatakana, UnicodeScript_kKatakana }, ++ { UnicodeScript_kHangulCompatibilityJamo, UnicodeScript_kHangulCompatibilityJamo, ++ UnicodeScript_kHangulCompatibilityJamo }, ++ { UnicodeScript_kHangulSyllable, UnicodeScript_kHangulSyllable, ++ UnicodeScript_kHangulSyllable }, ++ { UnicodeScript_kArabicPresentationB, UnicodeScript_kArabicPresentationB, ++ UnicodeScript_kArabicPresentationB }, ++ { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, UnicodeScript_kScriptCount } ++ }; ++ ++ switch (unicode::getUnicodeScriptType(cCode, aScripts, UnicodeScript_kScriptCount)) ++ { ++ case UnicodeScript_kBasicLatin: ++ case UnicodeScript_kLatin1Supplement: ++ case UnicodeScript_kLatinExtendedA: ++ case UnicodeScript_kLatinExtendedB: ++ case UnicodeScript_kLatinExtendedAdditional: ++ return "en"; ++ case UnicodeScript_kGreek: ++ case UnicodeScript_kGreekExtended: ++ return "el"; ++ case UnicodeScript_kCyrillic: ++ return "ru"; ++ case UnicodeScript_kArmenian: ++ return "hy"; ++ case UnicodeScript_kHebrew: ++ return "he"; ++ case UnicodeScript_kArabic: ++ case UnicodeScript_kArabicPresentationB: ++ return "ar"; ++ case UnicodeScript_kSyriac: ++ return "syr"; ++ case UnicodeScript_kThaana: ++ return "dv"; ++ case UnicodeScript_kDevanagari: ++ return "hi"; ++ case UnicodeScript_kBengali: ++ return "bn"; ++ case UnicodeScript_kGurmukhi: ++ return "pa"; ++ case UnicodeScript_kGujarati: ++ return "gu"; ++ case UnicodeScript_kOriya: ++ return "or"; ++ case UnicodeScript_kTamil: ++ return "ta"; ++ case UnicodeScript_kTelugu: ++ return "te"; ++ case UnicodeScript_kKannada: ++ return "ka"; ++ case UnicodeScript_kMalayalam: ++ return "ml"; ++ case UnicodeScript_kSinhala: ++ return "si"; ++ case UnicodeScript_kThai: ++ return "th"; ++ case UnicodeScript_kLao: ++ return "lo"; ++ case UnicodeScript_kTibetan: ++ return "bo"; ++ case UnicodeScript_kMyanmar: ++ return "my"; ++ case UnicodeScript_kGeorgian: ++ return "ka"; ++ case UnicodeScript_kHangulJamo: ++ case UnicodeScript_kHangulCompatibilityJamo: ++ case UnicodeScript_kHangulSyllable: ++ return "ko"; ++ case UnicodeScript_kEthiopic: ++ return "am"; ++ case UnicodeScript_kCherokee: ++ return "chr"; ++ case UnicodeScript_kUnifiedCanadianAboriginalSyllabics: ++ return "ui"; ++ case UnicodeScript_kKhmer: ++ return "km"; ++ case UnicodeScript_kMongolian: ++ return "mn"; ++ case UnicodeScript_kHiragana: ++ case UnicodeScript_kKatakana: ++ return "ja"; ++ default: ++ break; ++ } ++ ++ return NULL; ++} ++ + bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ) const + { + bool bRet = false; +@@ -764,14 +899,13 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r + FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8); + + const rtl::OString aLangAttrib = MsLangId::convertLanguageToIsoByteString(rPattern.meLanguage); ++ const FcChar8* pLangAttribUtf8 = NULL; + if( aLangAttrib.getLength() ) + { +- const FcChar8* pLangAttribUtf8; + if (aLangAttrib.equalsIgnoreAsciiCase(OString(RTL_CONSTASCII_STRINGPARAM("pa-in")))) + pLangAttribUtf8 = (FcChar8*)"pa"; + else + pLangAttribUtf8 = (FcChar8*)aLangAttrib.getStr(); +- FcPatternAddString(pPattern, FC_LANG, pLangAttribUtf8); + } + + // Add required Unicode characters, if any +@@ -783,11 +917,16 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r + // also handle unicode surrogates + const sal_uInt32 nCode = rMissingCodes.iterateCodePoints( &nStrIndex ); + FcCharSetAddChar( unicodes, nCode ); ++ if (!pLangAttribUtf8) ++ pLangAttribUtf8 = (const FcChar8*)pick_sample_language(nCode); + } + FcPatternAddCharSet(pPattern, FC_CHARSET, unicodes); + FcCharSetDestroy(unicodes); + } + ++ if( pLangAttribUtf8 ) ++ FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 ); ++ + addtopattern(pPattern, rPattern.meItalic, rPattern.meWeight, + rPattern.meWidthType, rPattern.mePitch); + +-- +1.7.7.3 + diff --git a/poppler0.18.1.patch b/poppler0.18.1.patch deleted file mode 100644 index a6b2267..0000000 --- a/poppler0.18.1.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-14 20:32:45.000000000 +0000 -+++ ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-14 20:30:53.000000000 +0000 -@@ -150,7 +150,7 @@ void writeBinaryBuffer( const OutputBuff - void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) - { - // dump JPEG file as-is --#if POPPLER_CHECK_VERSION(0, 17, 3) -+#if POPPLER_CHECK_VERSION(0, 17, 3) || POPPLER_CHECK_VERSION(0, 18, 1) - str = str->getBaseStream(); - #else - str = ((DCTStream *)str)->getRawStream(); -@@ -493,7 +493,7 @@ void PDFOutDev::endPage() - printf("endPage\n"); - } - --#if POPPLER_CHECK_VERSION(0, 17, 0) -+#if POPPLER_CHECK_VERSION(0, 17, 0) || POPPLER_CHECK_VERSION(0, 18, 1) - void PDFOutDev::processLink(AnnotLink *link, Catalog *) - #else - void PDFOutDev::processLink(Link* link, Catalog*) ---- ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-14 20:22:04.000000000 +0000 -+++ ./sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-14 20:22:55.000000000 +0000 -@@ -201,7 +201,7 @@ namespace pdfi - // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); - // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); - -- #if POPPLER_CHECK_VERSION(0, 17, 0) -+ #if POPPLER_CHECK_VERSION(0, 17, 0) || POPPLER_CHECK_VERSION(0, 18, 1) - virtual void processLink(AnnotLink *link, Catalog *catalog); - #else - //----- link borders diff --git a/vbahelper.visibility.patch b/vbahelper.visibility.patch deleted file mode 100644 index 5739100..0000000 --- a/vbahelper.visibility.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 -@@ -238,7 +238,7 @@ - - // including a HelperInterface implementation - template< typename Ifc1 > --class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > -+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > - { - typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; - protected: ---- sc/Library_vbaobj.mk -+++ sc/Library_vbaobj.mk -@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbaquerytable \ - sc/source/ui/vba/vbarange \ - sc/source/ui/vba/vbasheetobject \ -- sc/source/ui/vba/vbasheetobjects \ - sc/source/ui/vba/vbastyle \ - sc/source/ui/vba/vbastyles \ - sc/source/ui/vba/vbatextboxshape \ -@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbawsfunction \ - )) - -+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ -+ sc/source/ui/vba/vbasheetobjects \ -+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+)) -+ - ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) - $(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ diff --git a/xulrunner-to-mozila-plugin.pc.diff b/xulrunner-to-mozila-plugin.pc.diff deleted file mode 100644 index f9bb56c..0000000 --- a/xulrunner-to-mozila-plugin.pc.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -p -up ./extensions/source/plugin/util/makefile.pmk.orig3 ./extensions/source/plugin/util/makefile.pmk ---- extensions/source/plugin/util/makefile.pmk.orig3 2009-10-20 18:35:37.000000000 -0400 -+++ extensions/source/plugin/util/makefile.pmk 2009-10-20 18:37:43.000000000 -0400 -@@ -34,7 +34,9 @@ NOUNODOC=true - - .IF "$(SYSTEM_MOZILLA)" == "YES" - CFLAGS+=-DSYSTEM_MOZILLA --PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin -+# our xulrunner devel package still has -+# mozila-plugin.pc intead of xulrunner-plugin.pc -+PKGCONFIG_MODULES+=mozilla-plugin - .ENDIF - - .IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"