pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 4.1.1.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=52
This commit is contained in:
Petr Mladek 2013-08-13 17:18:39 +00:00 committed by Git OBS Bridge
parent 3a330d2e24
commit 5df385adf4
32 changed files with 150 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bridges-missing-cxxflags.diff Normal file
View File

@ -0,0 +1,11 @@
--- bridges/Library_cpp_uno.mk.old 2013-08-02 13:53:59.000000000 +0200
+++ bridges/Library_cpp_uno.mk 2013-08-02 13:54:22.000000000 +0200
@@ -230,7 +230,7 @@ $(eval $(call gb_Library_add_exception_o
$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/shared/cppinterfaceproxy \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ , $(CXXFLAGS) $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
# vim: set noet sw=4 ts=4:

10
build-link-rt.diff
View File

@ -1,10 +0,0 @@
--- Library_merged.mk.old 2013-07-23 12:40:26.000000000 +0200
+++ Library_merged.mk 2013-07-31 16:33:34.000000000 +0200
@@ -89,6 +89,7 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,merged,\
-lm \
-ldl \
+ -lrt \
-lpthread \
))
endif

30
buildfix-sdext-poppler-0.23.0.diff
View File

@ -1,30 +0,0 @@
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2013-06-20 09:13:52.000000000 +0200
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-07-16 15:49:35.000000000 +0200
@@ -178,7 +178,11 @@ namespace pdfi
virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
// Start a page.
- virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
+ virtual void startPage(int pageNum, GfxState *state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef *xref
+#endif
+ ) SAL_OVERRIDE;
// End a page.
virtual void endPage() SAL_OVERRIDE;
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old 2013-06-20 09:13:52.000000000 +0200
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2013-07-16 15:49:21.000000000 +0200
@@ -491,7 +491,11 @@ PDFOutDev::~PDFOutDev()
delete m_pUtf8Map;
}
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
+#if POPPLER_CHECK_VERSION(0, 23, 0)
+ , XRef* /*xref*/
+#endif
+)
{
assert(state);
printf("startPage %f %f\n",

3
libreoffice-4.1.0.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e42a149f37043f8a2e4456779324745621683c759bb451fcd69539f219d8075
size 121670716

3
libreoffice-4.1.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52c0d9e945cf20cf8e9f5511dd92991e14a42da5b32d60266e97e548f445c525
size 121717936

5
libreoffice-branding-upstream.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

2
libreoffice-branding-upstream.spec
View File

@ -17,7 +17,7 @@
Name: libreoffice-branding-upstream Name: libreoffice-branding-upstream
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define lo_home libreoffice %define lo_home libreoffice
Summary: Original Branding for LibreOffice Summary: Original Branding for LibreOffice

3
libreoffice-help-4.1.0.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:273003ceb9758ab0f4ee1952b61f787353d55e059a93ff9ca4141a5d59d5e0a0
size 1847260

3
libreoffice-help-4.1.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:484702e69473f2deceab369c318d14b7bbf4fba93abaa48cfa2021e4fe0d7879
size 1847564

8
libreoffice-help-en-US.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
this fixes build on SLED11
- do not unpack the huge libreoffice-translations tarball for en-US help
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

7
libreoffice-help-en-US.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-en-US
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
################################################################### ###################################################################
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -108,7 +108,6 @@ Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-%version.tar.xz Source0: libreoffice-%version.tar.xz
Source1: libreoffice-help-%version.tar.xz Source1: libreoffice-help-%version.tar.xz
Source2: libreoffice-translations-%version.tar.xz
Source10: build_prepare.inc Source10: build_prepare.inc
# make-3.82 is needed for parallel build # make-3.82 is needed for parallel build
# this version extends plain make-3.82 with --warn-undefined-functions option # this version extends plain make-3.82 with --warn-undefined-functions option
@ -143,7 +142,7 @@ stuff is in LibreOffice-l10n-en-US.
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-%version %setup -D -T -q -n libreoffice-%version
%else %else
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version %setup -q -a30 -a31 -b1 -n libreoffice-%version
# #
# patch zip-3.0 # patch zip-3.0
%if %suse_version < 1140 %if %suse_version < 1140
@ -162,6 +161,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

7
libreoffice-help-en-US.spec.in
View File

@ -18,7 +18,7 @@
Name: libreoffice-help-en-US Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -104,7 +104,6 @@ Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-%version.tar.xz Source0: libreoffice-%version.tar.xz
Source1: libreoffice-help-%version.tar.xz Source1: libreoffice-help-%version.tar.xz
Source2: libreoffice-translations-%version.tar.xz
Source10: build_prepare.inc Source10: build_prepare.inc
# make-3.82 is needed for parallel build # make-3.82 is needed for parallel build
# this version extends plain make-3.82 with --warn-undefined-functions option # this version extends plain make-3.82 with --warn-undefined-functions option
@ -139,7 +138,7 @@ stuff is in LibreOffice-l10n-en-US.
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-%version %setup -D -T -q -n libreoffice-%version
%else %else
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version %setup -q -a30 -a31 -b1 -n libreoffice-%version
# #
# patch zip-3.0 # patch zip-3.0
%if %suse_version < 1140 %if %suse_version < 1140
@ -158,6 +157,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

7
libreoffice-help-group1.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
this fixes build on SLED11
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

4
libreoffice-help-group1.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group1
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -346,6 +346,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

7
libreoffice-help-group2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
this fixes build on SLED11
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

4
libreoffice-help-group2.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group2
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -334,6 +334,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

7
libreoffice-help-group3.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
this fixes build on SLED11
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

4
libreoffice-help-group3.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group3
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -346,6 +346,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

7
libreoffice-help-group4.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
this fixes build on SLED11
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

4
libreoffice-help-group4.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group4
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -334,6 +334,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

7
libreoffice-help-group5.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
this fixes build on SLED11
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

4
libreoffice-help-group5.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group5
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -361,6 +361,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

4
libreoffice-help-groupX.spec.in
View File

@ -18,7 +18,7 @@
Name: libreoffice-help-group@GROUP_NUMBER@ Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define gnu_make_version 3.82 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301 %define gnu_make_snapshot 20120301
@ -139,6 +139,8 @@ cd -
%build %build
%{expand:%(cat %_sourcedir/build_prepare.inc)} %{expand:%(cat %_sourcedir/build_prepare.inc)}
# hack to pass configure check for python; it is not really needed to build the help
export PYTHON_FOR_BUILD=no
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--libdir=%{_libdir} \ --libdir=%{_libdir} \

5
libreoffice-icon-themes.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

2
libreoffice-icon-themes.spec
View File

@ -17,7 +17,7 @@
Name: libreoffice-icon-themes Name: libreoffice-icon-themes
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define ooo_home libreoffice %define ooo_home libreoffice
BuildRequires: libreoffice-icon-themes-prebuilt = %version BuildRequires: libreoffice-icon-themes-prebuilt = %version

5
libreoffice-l10n.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com

2
libreoffice-l10n.spec
View File

@ -22,7 +22,7 @@
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
################################################################### ###################################################################
Name: libreoffice-l10n Name: libreoffice-l10n
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define piece l10n %define piece l10n
%define ooo_home libreoffice %define ooo_home libreoffice

2
libreoffice-l10n.spec.in
View File

@ -18,7 +18,7 @@
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Name: libreoffice-l10n Name: libreoffice-l10n
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
%define piece l10n %define piece l10n
%define ooo_home libreoffice %define ooo_home libreoffice

3
libreoffice-translations-4.1.0.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:366dd84d06ad63ece03979a3ac2bc16e4318552ab949fc1f8648a4f4d136278a
size 128151924

3
libreoffice-translations-4.1.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb6a5eaa6a864ba13ae20fa1e85a0ea16d8aa2363e1999f85616157e5376c6d5
size 129898596

39
libreoffice.changes
View File

@ -1,7 +1,44 @@
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com
- update to 4.1.1.1:
* non-saved dialogs (fdo#67685)
* lost cell range name (fdo#62729)
* several performance regressions fixes
* allow to connect MariaDB (rhbz#989246)
* more on broken XLSX export (bnc#823935)
* broken master pages editing (fdo#66924)
* messed slide in PPTX import (bnc#593612)
* crossing lines in WMF pictures (i#122509)
* lost formatting in ODS export (fdo#67684)
* misplaced cursor in Web layout (fdo#66577)
* shapes anchoring in VML import (bnc#820504)
* several problems with time stamps (fdo#67387)
* lost lines created in report builder (fdo#33617)
* lost sheet protection in XLSX export (fdo#64753)
* paragraph style dialog height problems (fdo#67395)
* complex hyperlinks broken in PDF export (fdo#33605)
* lost background pictures in DOCX export (fdo#60990)
* VoiceOver does not follow keyboard focus (fdo#54320)
* some fields don't fit into options dialog (fdo#61544)
* lost text frame in DOCX export (bnc#822175, fdo#58577)
* non-smooth lines around fontwork (fdo#60282, fdo#66745)
* embedded fonts renders strangely on first load (fdo#67086)
* hyperlinks in table of illustrations (bnc#825976, fdo#39904)
* Calc reads any number of spaces as a single space (fdo#67094)
* initial MCE support in writerfilter OOXML tokenizer (bnc#820503)
* several RTF import/export fixes (fdo#39001, fdo#54900, fdo#64637,
fdo#65632, fdo#66274, fdo#66565, fdo#66682, fdo#67365)
- remove obsolete patches:
+ buildfix-sdext-poppler-0.23.0.diff: integrated upstream
+ build-link-rt.diff: integrated upstream
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges;
it is still not fixed and breaks build on SLED11 i586
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 12 12:30:27 UTC 2013 - dvaleev@suse.com Mon Aug 12 12:30:27 UTC 2013 - dvaleev@suse.com
- disable jfreereport extention for powerpc64 - disable jfreereport extension for powerpc64
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 1 14:46:22 UTC 2013 - pmladek@suse.com Thu Aug 1 14:46:22 UTC 2013 - pmladek@suse.com

12
libreoffice.spec
View File

@ -203,7 +203,7 @@ BuildRequires: python-lxml
%define ct2n_version 1.3.2 %define ct2n_version 1.3.2
%define gdocs_version 3.0.1 %define gdocs_version 3.0.1
%define numbertext_version 0.9.5 %define numbertext_version 0.9.5
Version: 4.1.0.4 Version: 4.1.1.1
Release: 0 Release: 0
Requires: libreoffice-branding >= 4.0 Requires: libreoffice-branding >= 4.0
Requires: libreoffice-icon-themes = %version Requires: libreoffice-icon-themes = %version
@ -594,9 +594,6 @@ Patch2: split-icons-search-usr-share.diff
# search help icons in /usr/share # search help icons in /usr/share
# FIXME: make it configurable in integrate into git # FIXME: make it configurable in integrate into git
Patch3: officecfg-help-in-usr-share.diff Patch3: officecfg-help-in-usr-share.diff
# liblt is linked with librt, so we need to link the mergedlib with librt as well
# it fixes build on SLED11
Patch4: build-link-rt.diff
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build # to avoid BerkleyDB incompatibility with the plain build
# FIXME: make it configurable and push upstream # FIXME: make it configurable and push upstream
@ -620,10 +617,10 @@ Patch13: jvmfwk-disable-gcj.diff
# generate selected bytecode version also in gbuild # generate selected bytecode version also in gbuild
# FIXME: push upstream and be ready to fix problem on other systems # FIXME: push upstream and be ready to fix problem on other systems
Patch14: solenv-java-source-version.diff Patch14: solenv-java-source-version.diff
# lost RPM optflags when compiling bridges
Patch15: bridges-missing-cxxflags.diff
# Letter and Fax tamplates can't be created by python-2.6 if ODF file type description uses non-Ascii characters # Letter and Fax tamplates can't be created by python-2.6 if ODF file type description uses non-Ascii characters
Patch17: wizards-create-temlates-with-python-2.6.diff Patch17: wizards-create-temlates-with-python-2.6.diff
# fix build with system poppler-0.23.0
Patch18: buildfix-sdext-poppler-0.23.0.diff
# #
# cpp/poppler-version.h is not included in older poppler packages # cpp/poppler-version.h is not included in older poppler packages
# FIXME: make it configurable to push upstream # FIXME: make it configurable to push upstream
@ -1302,7 +1299,6 @@ the LibreOffice localizations separately.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4
%patch5 %patch5
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
@ -1312,8 +1308,8 @@ the LibreOffice localizations separately.
%patch12 %patch12
%patch13 -p1 %patch13 -p1
%patch14 %patch14
%patch15
%patch17 -p1 %patch17 -p1
%patch18
# #
%if %suse_version >= 1110 && %suse_version < 1120 %if %suse_version >= 1110 && %suse_version < 1120
# cpp/poppler-version.h is not included in older poppler packages # cpp/poppler-version.h is not included in older poppler packages