rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity
libreoffice/solenv-java-source-version.diff

13 lines
680 B
Diff
Raw Normal View History

- Version bump to 4.2.0rc for testing purposes. - 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
2014-01-02 10:24:51 +00:00
diff -urN libreoffice-4.2.0.1.old/solenv/gbuild/JavaClassSet.mk libreoffice-4.2.0.1/solenv/gbuild/JavaClassSet.mk
--- libreoffice-4.2.0.1.old/solenv/gbuild/JavaClassSet.mk 2014-01-01 13:44:24.824887549 +0000
+++ libreoffice-4.2.0.1/solenv/gbuild/JavaClassSet.mk 2014-01-01 13:47:08.727872354 +0000
@@ -40,6 +40,8 @@
- updated to version 3.6.2.2.1 (SUSE 3.6 rc1 based on upstream 3.6.2.2) OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=15
2012-10-31 16:59:37 +00:00
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
$(gb_JavaClassSet_XBOOTCLASSPATH) \
+ -source $(JAVA_SOURCE_VER) \
+ -target $(JAVA_TARGET_VER) \
-Xbootclasspath/p:$(XBOOT_CP_P) \
Accepting request 171281 from LibreOffice:Unstable - update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) OBS-URL: https://build.opensuse.org/request/show/171281 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=30
2013-04-17 12:53:49 +00:00
-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
- updated to version 3.6.2.2.1 (SUSE 3.6 rc1 based on upstream 3.6.2.2) OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=15
2012-10-31 16:59:37 +00:00
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
Copy Permalink