50292f6463
- Version bump to 4.2.0rc for testing purposes - Update the spec file to be only one building everything - Cleanup of spec with removal of old cruft here and there - Remove bundled libs always demand the system versions - Remove bundled tarballs that are no longer used - Removed patches no longer usable: * fix-collision.patch * zip-3.0-add_options_to_help.patch * zip-3.0-iso8859_2.patch * zip-3.0-nonexec-stack.patch * zip-3.0-optflags.patch * zip-3.0-tempfile.patch * zip-notimestamp.patch * solenv-touch-no-dereference.diff * split-help-buildhack-no-vcl.diff * system-poppler-0.12.3.diff * scripting-prefer-internal-rhino.diff * build-help-common.diff - Refreshed patches: * office-cfg-linux-common-template-dir.diff * officecfg-help-in-usr-share.diff * solenv-java-source-version.diff * wizards-create-temlates-with-python-2.6.diff - To be fixed: * split-icons-search-usr-share.diff - Obsoleted specs: * libreoffice-help-en-US.spec * libreoffice-help-group1.spec OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=60
34 lines
1.8 KiB
Diff
34 lines
1.8 KiB
Diff
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
|
|
--- libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2013-12-30 11:24:13.235021217 +0100
|
|
+++ libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2014-01-01 14:16:37.708042106 +0100
|
|
@@ -98,7 +98,7 @@
|
|
</node>
|
|
<node oor:name="Help" oor:op="fuse" oor:mandatory="true">
|
|
<node oor:name="InternalPaths">
|
|
- <node oor:name="$(instpath)/help" oor:op="fuse"/>
|
|
+ <node oor:name="/usr/share/help" oor:op="fuse"/>
|
|
</node>
|
|
</node>
|
|
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
|
|
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
|
--- libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-12-30 11:24:13.232021217 +0100
|
|
+++ libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2014-01-01 14:16:37.710042106 +0100
|
|
@@ -1613,7 +1613,7 @@
|
|
<info>
|
|
<desc>Specifies the path to the Office help files.</desc>
|
|
</info>
|
|
- <value>$(instpath)/help</value>
|
|
+ <value>/usr/share/libreoffice/help</value>
|
|
</prop>
|
|
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
|
|
<info>
|
|
@@ -1808,7 +1808,7 @@
|
|
<desc>Specifies the default directory where Office help files are
|
|
located.</desc>
|
|
</info>
|
|
- <value>$(instpath)/help</value>
|
|
+ <value>/usr/share/libreoffice/help</value>
|
|
</prop>
|
|
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
|
|
<info>
|