[Libreoffice-commits] core.git: setup_native/source

[Michael Stahl (via logerrit)]

 setup_native/source/packinfo/packinfo_office.txt |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit e3e1c7561105b5e8766e747f978d49469fd44a55
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue May 7 11:14:47 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue May 7 13:08:56 2019 +0200

    tdf#119044 setup_native: let -core depend on -ooofonts
    
    Things break without OpenSymbol font.  On the other hand, if you
    install just the fonts, but not anything else, you can happily use
    the fonts in other applications.  So just invert the dependency.
    
    Change-Id: I4c2dbff59699365cba67d3b1c6ade5ec7c2462bf
    Reviewed-on: https://gerrit.libreoffice.org/71898
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 7eb616fbf2c5..63a2c93b1682 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -85,9 +85,10 @@ module = "gid_Module_Root"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
 linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01, %BASISPACKAGEPREFIX%PRODUCTVERSION-core02, %BASISPACKAGEPREFIX%PRODUCTVERSION-core03, %BASISPACKAGEPREFIX%PRODUCTVERSION-core04, %BASISPACKAGEPREFIX%PRODUCTVERSION-core05, %BASISPACKAGEPREFIX%PRODUCTVERSION-core06, %BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
-requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure"
-freebsdrequires = ""
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION, %BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl,
+SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts"
+freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
 findrequires = "find-requires-x11.sh"
 copyright = "2019 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
@@ -324,10 +325,10 @@ End
 Start
 module = "gid_Module_Root_Fonts_OOo_Hidden"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
+solarisrequires = ""
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+freebsdrequires = ""
+requires = ""
 copyright = "2019 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"