Accepting request 202644 from LibreOffice:Factory
- Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Version bump to 4.1.2.3: bugfix release only. - Remove upstreamed patch buildfix-neon-0.30.0.diff. - Adjust patch jvmfwk-disable-gcj.diff to reflect current state. OBS-URL: https://build.opensuse.org/request/show/202644 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=55
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
commit
075c13ab63
@ -1,51 +0,0 @@
|
||||
From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Mon, 12 Aug 2013 09:39:59 +0200
|
||||
Subject: [PATCH] only use the SSPI support with internal neon
|
||||
|
||||
neon 0.30.0 has added support for SSPI (author of the commit is kso,
|
||||
which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the
|
||||
signature of ne_auth_creds remains the same as before. That means that
|
||||
build with system neon 0.30.0 fails...
|
||||
---
|
||||
RepositoryExternal.mk | 1 +
|
||||
ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++--
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
|
||||
index f866957..8c19c27 100644
|
||||
--- a/RepositoryExternal.mk
|
||||
+++ b/RepositoryExternal.mk
|
||||
@@ -867,6 +867,7 @@ ifeq ($(SYSTEM_NEON),YES)
|
||||
define gb_LinkTarget__use_neon
|
||||
$(call gb_LinkTarget_add_defs,$(1),\
|
||||
-DNEON_VERSION=0x$(NEON_VERSION) \
|
||||
+ -DSYSTEM_NEON \
|
||||
)
|
||||
$(call gb_LinkTarget_set_include,$(1),\
|
||||
$$(INCLUDE) \
|
||||
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
|
||||
index 34a1937..cee643a 100644
|
||||
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
|
||||
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
|
||||
@@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
|
||||
}
|
||||
|
||||
extern "C" int NeonSession_NeonAuth( void * inUserData,
|
||||
-#ifdef NE_FEATURE_SSPI
|
||||
+#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
|
||||
const char * inAuthProtocol,
|
||||
#endif
|
||||
const char * inRealm,
|
||||
@@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData,
|
||||
|
||||
bool bCanUseSystemCreds = false;
|
||||
|
||||
-#ifdef NE_FEATURE_SSPI
|
||||
+#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
|
||||
bCanUseSystemCreds
|
||||
= (attempt == 0) && // avoid endless loops
|
||||
ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
|
||||
--
|
||||
1.7.12.4
|
||||
|
||||
@ -1,17 +1,7 @@
|
||||
From 72c7b66480870e42fbdf5d555986d2f9da3786b1 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mladek <pmladek@suse.cz>
|
||||
Date: Fri, 5 Aug 2011 17:34:05 +0200
|
||||
Subject: [PATCH] jvmfwk-disable-gcj.diff: LO newer worked well with it
|
||||
|
||||
---
|
||||
.../OpenOfficeorg/javavendors_linux.xml | 4 ----
|
||||
1 files changed, 0 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
||||
index 489511f..5262ca4 100644
|
||||
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
||||
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
||||
@@ -18,9 +18,6 @@
|
||||
diff -urN libreoffice-4.1.2.3.old/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml libreoffice-4.1.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
|
||||
--- libreoffice-4.1.2.3.old/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2013-10-08 16:50:15.977432391 +0200
|
||||
+++ libreoffice-4.1.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2013-10-08 16:51:47.260432381 +0200
|
||||
@@ -35,9 +35,6 @@
|
||||
<vendor name="Blackdown Java-Linux Team">
|
||||
<minVersion>1.5.0</minVersion>
|
||||
</vendor>
|
||||
@ -21,14 +11,11 @@ index 489511f..5262ca4 100644
|
||||
<vendor name="BEA Systems, Inc.">
|
||||
<minVersion>1.5.0</minVersion>
|
||||
</vendor>
|
||||
@@ -31,7 +28,6 @@
|
||||
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
|
||||
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
|
||||
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
|
||||
- <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
|
||||
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library>
|
||||
@@ -48,7 +45,6 @@
|
||||
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
|
||||
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
|
||||
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
|
||||
- <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
|
||||
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
|
||||
</plugins>
|
||||
</javaSelection>
|
||||
--
|
||||
1.7.8.3
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f62611bdd13f8197ebdaf8f2fa24a8d40d75de11c996f5280e8765377bb1ea03
|
||||
size 121747824
|
||||
3
libreoffice-4.1.2.3.tar.xz
Normal file
3
libreoffice-4.1.2.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:29ee22adeb46333d86e5f621ceccfc66119b0c066cb20562303f1a7733a459f0
|
||||
size 121781100
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:35 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libreoffice-branding-upstream
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define lo_home libreoffice
|
||||
Summary: Original Branding for LibreOffice
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5391d0ff9f7e6bbb4517ec8fb192effeb8e93903b58f99f1411ebe4bd3048965
|
||||
size 1847556
|
||||
3
libreoffice-help-4.1.2.3.tar.xz
Normal file
3
libreoffice-help-4.1.2.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:97724d05de5e8d22a3c248c0900d35031e9bd7757476c02b561e15e122822fe9
|
||||
size 1847696
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:35 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-en-US
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
|
||||
###################################################################
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-en-US
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:35 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group1
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:36 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group2
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:36 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group3
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:36 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group4
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:37 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group5
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-group@GROUP_NUMBER@
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:37 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libreoffice-icon-themes
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define ooo_home libreoffice
|
||||
BuildRequires: libreoffice-icon-themes-prebuilt = %version
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:37 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
|
||||
###################################################################
|
||||
Name: libreoffice-l10n
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Name: libreoffice-l10n
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c937e66623c1986f23eecd9d289f40e9182689929b787a57478758098f244a88
|
||||
size 130017392
|
||||
3
libreoffice-translations-4.1.2.3.tar.xz
Normal file
3
libreoffice-translations-4.1.2.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ca9e0ed7840f2d131704f99cbe7e669497b26b5da8d424ddaff5686251a8de29
|
||||
size 130174164
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:45:37 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 4.1.2.3: bugfix release only.
|
||||
- Remove upstreamed patch buildfix-neon-0.30.0.diff.
|
||||
- Adjust patch jvmfwk-disable-gcj.diff to reflect current state.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -203,7 +203,7 @@ BuildRequires: python-lxml
|
||||
%define ct2n_version 1.3.2
|
||||
%define gdocs_version 3.0.1
|
||||
%define numbertext_version 0.9.5
|
||||
Version: 4.1.1.2
|
||||
Version: 4.1.2.3
|
||||
Release: 0
|
||||
Requires: libreoffice-branding >= 4.0
|
||||
Requires: libreoffice-icon-themes = %version
|
||||
@ -605,9 +605,6 @@ Patch6: pack-desktop-files-for-optional-filters.diff
|
||||
# put internal rhino into XBootClasspath to fix build with OpenJDK
|
||||
# FIXME: make it clean to be able to push upstream
|
||||
Patch7: scripting-prefer-internal-rhino.diff
|
||||
# fix build with neon-0.30.0; only use the SSPI support with internal neon
|
||||
# FIXME: this has already been included in upstream 4.1.2, and 4.2
|
||||
Patch8: buildfix-neon-0.30.0.diff
|
||||
# search <lo-home>/share/template/common for language independent templates
|
||||
# FIXME: make it configurable to push upstream
|
||||
Patch9: office-cfg-linux-common-template-dir.diff
|
||||
@ -1308,7 +1305,6 @@ the LibreOffice localizations separately.
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user