Skip to content

C
core
Kaydet (Commit) e3e1c756 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

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: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst feecbabd
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
setup_native/source/packinfo/packinfo_office.txt
Dosyayı görüntüle @ e3e1c756
...@@ -85,9 +85,10 @@ module = "gid_Module_Root" ...@@ -85,9 +85,10 @@ module = "gid_Module_Root"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-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" 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" 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" solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl,
freebsdrequires = "" SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
findrequires = "find-requires-x11.sh" findrequires = "find-requires-x11.sh"
copyright = "2019 The Document Foundation" copyright = "2019 The Document Foundation"
solariscopyright = "solariscopyrightfile" solariscopyright = "solariscopyrightfile"
...@@ -324,10 +325,10 @@ End ...@@ -324,10 +325,10 @@ End
Start Start
module = "gid_Module_Root_Fonts_OOo_Hidden" module = "gid_Module_Root_Fonts_OOo_Hidden"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" solarisrequires = ""
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" freebsdrequires = ""
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" requires = ""
copyright = "2019 The Document Foundation" copyright = "2019 The Document Foundation"
solariscopyright = "solariscopyrightfile" solariscopyright = "solariscopyrightfile"
vendor = "The Document Foundation" vendor = "The Document Foundation"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment