Accepting request 477959 from LibreOffice:Factory
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/477959 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=127
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3078c9be70
@ -1,39 +0,0 @@
|
||||
From 18f068baca7630afdc8d02a4e21a4aa1a9d70f86 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
||||
Date: Thu, 5 Jan 2017 16:06:10 +0100
|
||||
Subject: [PATCH] unixODBC changed soname to .2 so reflect it
|
||||
|
||||
we dlopen this library and thus we should be able to find it with any
|
||||
soname, so far .1 and .2 seem to be used.
|
||||
|
||||
Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280
|
||||
---
|
||||
dbaccess/source/ui/dlg/odbcconfig.cxx | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
|
||||
index cd1b583e1840..163fc8549d06 100644
|
||||
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
|
||||
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
|
||||
@@ -38,6 +38,7 @@
|
||||
#ifdef MACOSX
|
||||
#define ODBC_LIBRARY "libiodbc.dylib"
|
||||
#else
|
||||
+#define ODBC_LIBRARY_2 "libodbc.so.2"
|
||||
#define ODBC_LIBRARY_1 "libodbc.so.1"
|
||||
#define ODBC_LIBRARY "libodbc.so"
|
||||
#endif
|
||||
@@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration()
|
||||
if ( !bLoaded )
|
||||
bLoaded = load(ODBC_LIBRARY_1);
|
||||
#endif
|
||||
+#ifdef ODBC_LIBRARY_2
|
||||
+ if ( !bLoaded )
|
||||
+ bLoaded = load(ODBC_LIBRARY_2);
|
||||
+#endif
|
||||
|
||||
if ( bLoaded )
|
||||
{
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e
|
||||
size 168797580
|
||||
3
libreoffice-5.3.1.1.tar.xz
Normal file
3
libreoffice-5.3.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7bbb8c09634a17ef19d8ab7ac79966f04fd03f8b561a8b3d9b77b9c395e16d3e
|
||||
size 169363848
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f
|
||||
size 1615344
|
||||
3
libreoffice-help-5.3.1.1.tar.xz
Normal file
3
libreoffice-help-5.3.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:23e890ca384e7274d1e6104cbc7660a3c02caa2937c360dd8d53d7f2afff1218
|
||||
size 1615320
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4321a57fba1012b30eae6e629f18d4139395fd5751af381dc87e31e084fca1d1
|
||||
size 140659960
|
||||
3
libreoffice-translations-5.3.1.1.tar.xz
Normal file
3
libreoffice-translations-5.3.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:701b8eb20c59f69cc191cbe2c5fcbdd5ebe6f5ea5b1385c97fe74456b0b0605e
|
||||
size 140722684
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 27 13:59:24 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 5.3.1.1:
|
||||
* RC1 of 5.3.1 release containing various bugfixes
|
||||
- Drop upstreamed patch 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 16 12:19:35 UTC 2017 - normand@linux.vnet.ibm.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.0
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.1
|
||||
# Wether to enable the kde integration
|
||||
%if 0%{?is_opensuse}
|
||||
%bcond_without kdeintegration
|
||||
@ -35,7 +35,7 @@
|
||||
%bcond_with firebird
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 5.3.0.3
|
||||
Version: 5.3.1.1
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
|
||||
@ -76,7 +76,6 @@ Patch1: scp2-user-config-suse.diff
|
||||
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
|
||||
Patch4: nlpsolver-no-broken-help.diff
|
||||
Patch5: mediawiki-no-broken-help.diff
|
||||
Patch6: 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch
|
||||
# PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
|
||||
Patch16: libreoffice-hotfix-disablebrokenshapetest.patch
|
||||
# try to save space by using hardlinks
|
||||
@ -906,15 +905,12 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%langpack -l nb -n Bokmal -M -m no
|
||||
%langpack -l nl -n Dutch -X -m nl_NL
|
||||
%langpack -l nn -n Nynorsk -m no
|
||||
%define langpack_lang Southern Ndebele
|
||||
%langpack -l nr -n %{langpack_lang}
|
||||
%define langpack_lang Northern Sotho
|
||||
%langpack -l nso -n %{langpack_lang}
|
||||
%langpack -l nr -n Southern_Ndebele
|
||||
%langpack -l nso -n Northern_Sotho
|
||||
%langpack -l or -n Odia -s ctl
|
||||
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN
|
||||
%langpack -l pl -n Polish -X -m pl_PL
|
||||
%define langpack_lang Brazilian Portuguese
|
||||
%langpack -l pt_BR -n %{langpack_lang} -m pt_BR -L pt-BR -p pt-BR -X
|
||||
%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X
|
||||
%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT
|
||||
%langpack -l ro -n Romanian -M -X
|
||||
%langpack -l ru -n Russian -X -m ru_RU
|
||||
@ -923,8 +919,7 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%langpack -l sl -n Slovenian -X -m sl_SI
|
||||
%langpack -l sr -n Serbian -i sr-Latn -M
|
||||
%langpack -l ss -n Swati
|
||||
%define langpack_lang Southern Sotho
|
||||
%langpack -l st -n %{langpack_lang}
|
||||
%langpack -l st -n Southern_Sotho
|
||||
%langpack -l sv -n Swedish -X -m sv_SE
|
||||
%langpack -l ta -n Tamil -s ctl
|
||||
%langpack -l te -n Telugu -m te_IN
|
||||
@ -935,12 +930,9 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%langpack -l uk -n Ukrainian -m uk_UA
|
||||
%langpack -l ve -n Venda
|
||||
%langpack -l xh -n Xhosa
|
||||
%define langpack_lang Simplified Chinese
|
||||
%langpack -l zh_CN -n %{langpack_lang} -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans
|
||||
%define langpack_lang Traditional Chinese
|
||||
%langpack -l zh_TW -n %{langpack_lang} -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant
|
||||
%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans
|
||||
%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant
|
||||
%langpack -l zu -n Zulu -m zu_ZA
|
||||
%undefine langpack_lang
|
||||
|
||||
%prep
|
||||
%setup -q -b1 -b2
|
||||
@ -951,7 +943,6 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%endif
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
%patch16 -p1
|
||||
%patch990 -p1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user