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
29 lines
1.9 KiB
Diff
29 lines
1.9 KiB
Diff
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Common.xcu
|
|
--- libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu 2013-12-30 11:24:13.235021217 +0100
|
|
+++ libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Common.xcu 2014-01-01 14:21:15.331016368 +0100
|
|
@@ -703,4 +703,6 @@
|
|
<value oor:external="com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/>
|
|
</prop>
|
|
</node>
|
|
+ <!-- FIXME: This comment is needed to change a checksum or so.
|
|
+ Then the updated list of templates paths is read from Common.xcs-->
|
|
</oor:component-data>
|
|
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:22:32.801009186 +0100
|
|
@@ -1667,6 +1667,14 @@
|
|
<value>
|
|
<it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
|
|
<it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
|
|
+ <it>file:///usr/share/templates/libreoffice/common</it>
|
|
+ <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
|
|
+ <it>file:///usr/share/templates/ooo/common</it>
|
|
+ <it>file:///usr/share/templates/ooo/$(vlang)</it>
|
|
+ <it>file:///usr/share/templates/libreoffice/common</it>
|
|
+ <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
|
|
+ <it>file:///usr/share/templates/ooo/common</it>
|
|
+ <it>file:///usr/share/templates/ooo/$(vlang)</it>
|
|
<it>$(userurl)/template</it>
|
|
</value>
|
|
</prop>
|