From 4639722def2791f4d20d9e84935c6a6eb31973b841911954eac4747432960b02 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Thu, 22 Aug 2013 15:09:47 +0000 Subject: [PATCH] - update to 4.1.1.2 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=53 --- ...2d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 | 3 - ...e5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 | 3 + build-help-common.diff | 76 +++++++++++++++++++ buildfix-neon-0.30.0.diff | 51 +++++++++++++ libreoffice-4.1.1.1.tar.xz | 3 - libreoffice-4.1.1.2.tar.xz | 3 + libreoffice-branding-upstream.changes | 5 ++ libreoffice-branding-upstream.spec | 2 +- libreoffice-help-4.1.1.1.tar.xz | 3 - libreoffice-help-4.1.1.2.tar.xz | 3 + libreoffice-help-en-US.changes | 5 ++ libreoffice-help-en-US.spec | 2 +- libreoffice-help-en-US.spec.in | 2 +- libreoffice-help-group1.changes | 5 ++ libreoffice-help-group1.spec | 2 +- libreoffice-help-group2.changes | 5 ++ libreoffice-help-group2.spec | 2 +- libreoffice-help-group3.changes | 5 ++ libreoffice-help-group3.spec | 2 +- libreoffice-help-group4.changes | 5 ++ libreoffice-help-group4.spec | 2 +- libreoffice-help-group5.changes | 5 ++ libreoffice-help-group5.spec | 2 +- libreoffice-help-groupX.spec.in | 2 +- libreoffice-icon-themes.changes | 5 ++ libreoffice-icon-themes.spec | 2 +- libreoffice-l10n.changes | 5 ++ libreoffice-l10n.spec | 2 +- libreoffice-l10n.spec.in | 2 +- libreoffice-translations-4.1.1.1.tar.xz | 3 - libreoffice-translations-4.1.1.2.tar.xz | 3 + libreoffice.changes | 21 +++++ libreoffice.spec | 13 +++- 33 files changed, 227 insertions(+), 27 deletions(-) delete mode 100644 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 create mode 100644 a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 create mode 100644 build-help-common.diff create mode 100644 buildfix-neon-0.30.0.diff delete mode 100644 libreoffice-4.1.1.1.tar.xz create mode 100644 libreoffice-4.1.1.2.tar.xz delete mode 100644 libreoffice-help-4.1.1.1.tar.xz create mode 100644 libreoffice-help-4.1.1.2.tar.xz delete mode 100644 libreoffice-translations-4.1.1.1.tar.xz create mode 100644 libreoffice-translations-4.1.1.2.tar.xz diff --git a/972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 b/972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 deleted file mode 100644 index e4212d1..0000000 --- a/972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:489541f969b3c54bca863a986eb4c322cd480af946fff17f922022234c985304 -size 698026 diff --git a/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 b/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 new file mode 100644 index 0000000..9224647 --- /dev/null +++ b/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:210c216bbbf67603f891373362ec0427aeb36bfcaf881d43433db85ca2160d7c +size 684918 diff --git a/build-help-common.diff b/build-help-common.diff new file mode 100644 index 0000000..0b9671a --- /dev/null +++ b/build-help-common.diff @@ -0,0 +1,76 @@ +--- configure.ac.old 2013-08-13 18:06:46.000000000 +0200 ++++ configure.ac 2013-08-16 13:00:37.000000000 +0200 +@@ -1652,7 +1652,16 @@ AC_ARG_WITH(jdk-home, + + AC_ARG_WITH(help, + AS_HELP_STRING([--with-help], +- [Enable the build of help.])) ++ [Enable the build of help. There is a special parameter "common" that ++ can be used to bundle only the common part, .e.g help-specific icons. ++ This is useful when you build the helpcontent separately.]) ++ [ ++ Usage: --with-help build the entire local help ++ --without-help no local help (default) ++ --with-help=common bundle common files for the local ++ help but do not build the whole help ++ ], ++,) + + AC_ARG_WITH(java, + AS_HELP_STRING([--with-java], +@@ -4386,14 +4395,21 @@ fi + AC_SUBST(DO_FETCH_TARBALLS) + + AC_MSG_CHECKING([whether to build help]) +-if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then +- AC_MSG_RESULT([yes]) ++HELP_COMMON_ONLY=FALSE ++if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Android; then + BUILD_TYPE="$BUILD_TYPE HELP" +- SCPDEFS="$SCPDEFS -DWITH_HELP" + GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES" ++ if test "$with_help" = "common" ; then ++ HELP_COMMON_ONLY=TRUE ++ AC_MSG_RESULT([common only]) ++ else ++ SCPDEFS="$SCPDEFS -DWITH_HELP" ++ AC_MSG_RESULT([yes]) ++ fi + else + AC_MSG_RESULT([no]) + fi ++AC_SUBST(HELP_COMMON_ONLY) + + dnl Test whether to include MySpell dictionaries + dnl =================================================================== +--- config_host.mk.in.old 2013-08-06 19:25:04.000000000 +0200 ++++ config_host.mk.in 2013-08-16 13:05:10.000000000 +0200 +@@ -228,6 +228,7 @@ export HAVE_NON_CONST_NPP_GETMIMEDESCRIP + export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@ + export HAVE_READDIR_R=@HAVE_READDIR_R@ + export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@ ++export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@ + export HOST_PLATFORM=@host@ + export HSQLDB_JAR=@HSQLDB_JAR@ + export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@ +--- helpcontent2/Module_helpcontent2.mk.old 2013-08-06 19:24:32.000000000 +0200 ++++ helpcontent2/Module_helpcontent2.mk 2013-08-16 14:51:47.000000000 +0200 +@@ -9,6 +9,7 @@ + + $(eval $(call gb_Module_Module,helpcontent2)) + ++ifneq ($(HELP_COMMON_ONLY),TRUE) + $(eval $(call gb_Module_add_targets,helpcontent2,\ + AllLangHelp_sbasic \ + AllLangHelp_scalc \ +@@ -19,6 +20,10 @@ $(eval $(call gb_Module_add_targets,help + AllLangHelp_simpress \ + AllLangHelp_smath \ + AllLangHelp_swriter \ ++)) ++endif ++ ++$(eval $(call gb_Module_add_targets,helpcontent2,\ + CustomTarget_imagelist \ + Package_imagelist \ + )) diff --git a/buildfix-neon-0.30.0.diff b/buildfix-neon-0.30.0.diff new file mode 100644 index 0000000..53c3236 --- /dev/null +++ b/buildfix-neon-0.30.0.diff @@ -0,0 +1,51 @@ +From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001 +From: David Tardon +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 + diff --git a/libreoffice-4.1.1.1.tar.xz b/libreoffice-4.1.1.1.tar.xz deleted file mode 100644 index b802bba..0000000 --- a/libreoffice-4.1.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52c0d9e945cf20cf8e9f5511dd92991e14a42da5b32d60266e97e548f445c525 -size 121717936 diff --git a/libreoffice-4.1.1.2.tar.xz b/libreoffice-4.1.1.2.tar.xz new file mode 100644 index 0000000..4233636 --- /dev/null +++ b/libreoffice-4.1.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f62611bdd13f8197ebdaf8f2fa24a8d40d75de11c996f5280e8765377bb1ea03 +size 121747824 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index 4ca1852..04370d8 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index e8c9437..0bbc966 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -17,7 +17,7 @@ Name: libreoffice-branding-upstream -Version: 4.1.1.1 +Version: 4.1.1.2 Release: 0 %define lo_home libreoffice Summary: Original Branding for LibreOffice diff --git a/libreoffice-help-4.1.1.1.tar.xz b/libreoffice-help-4.1.1.1.tar.xz deleted file mode 100644 index 94da6dc..0000000 --- a/libreoffice-help-4.1.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:484702e69473f2deceab369c318d14b7bbf4fba93abaa48cfa2021e4fe0d7879 -size 1847564 diff --git a/libreoffice-help-4.1.1.2.tar.xz b/libreoffice-help-4.1.1.2.tar.xz new file mode 100644 index 0000000..855da35 --- /dev/null +++ b/libreoffice-help-4.1.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5391d0ff9f7e6bbb4517ec8fb192effeb8e93903b58f99f1411ebe4bd3048965 +size 1847556 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 7111a2e..71ec870 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index de54536..3ec7ed3 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index aae9064..b27003f 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -18,7 +18,7 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 4.1.1.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index 3c11624..da0fd40 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index d29b5f0..c7e69d2 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index eeb4131..68a7582 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index f4855d7..ba8fc0b 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index e0db622..6e7c1b8 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 1deaafb..9b51743 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index 05dfdbb..a19f9f9 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index f5ca2f3..6c7e91c 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index 4f5949b..a6feec4 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 0b6eee3..30105e2 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index 590e4fe..f1a5d8d 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -18,7 +18,7 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 4.1.1.1 +Version: 4.1.1.2 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index 18f4592..8793ff0 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index af83241..46f7b4b 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 4.1.1.1 +Version: 4.1.1.2 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index 2d60103..9d0752f 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2 + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index f844397..e555822 100644 --- a/libreoffice-l10n.spec +++ b/libreoffice-l10n.spec @@ -22,7 +22,7 @@ ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ################################################################### Name: libreoffice-l10n -Version: 4.1.1.1 +Version: 4.1.1.2 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index ecd9b1d..4accab0 100644 --- a/libreoffice-l10n.spec.in +++ b/libreoffice-l10n.spec.in @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 4.1.1.1 +Version: 4.1.1.2 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-translations-4.1.1.1.tar.xz b/libreoffice-translations-4.1.1.1.tar.xz deleted file mode 100644 index 0f5f974..0000000 --- a/libreoffice-translations-4.1.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb6a5eaa6a864ba13ae20fa1e85a0ea16d8aa2363e1999f85616157e5376c6d5 -size 129898596 diff --git a/libreoffice-translations-4.1.1.2.tar.xz b/libreoffice-translations-4.1.1.2.tar.xz new file mode 100644 index 0000000..1b21e54 --- /dev/null +++ b/libreoffice-translations-4.1.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c937e66623c1986f23eecd9d289f40e9182689929b787a57478758098f244a88 +size 130017392 diff --git a/libreoffice.changes b/libreoffice.changes index 92e21ff..4365588 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com + +- update to 4.1.1.2: + * first page styles (fdo#66145) + * Calc crashes on spell check (fdo#68220) + * broken options in ReportBuilder (fdo#67109) + * can't save new autocorrect entries (fdo#67743) + * checking for extension updates crasher (fdo#67539) + * font style is not saved in ODG and ODP (fdo#67665) + * broken formula expressions on XLS export (fdo#67571) + * can't select other fill than color in Writer (fdo#66827) + * soffice.bin segfault in libvclplug_gtklo.so (rhbz#998136) +- update libwpd to version 0.9.9: + + infinite loop when using WPXBinaryData +- build-help-common.diff: allow to bundle the help icons even when + help is built separately +- buildfix-neon-0.30.0.diff: fix build with neon-0.30.0; only use the SSPI + support with internal neon; took from master branch +- use the new --with-help=common configure option + ------------------------------------------------------------------- Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index f509e26..59fcf30 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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.1 +Version: 4.1.1.2 Release: 0 Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %version @@ -566,7 +566,7 @@ Source1033: b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2 Source1034: 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 Source1035: 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source1036: 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip -Source1037: 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 +Source1037: a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 Source1038: 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2 Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip Source1040: 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz @@ -594,6 +594,8 @@ Patch2: split-icons-search-usr-share.diff # search help icons in /usr/share # FIXME: make it configurable in integrate into git Patch3: officecfg-help-in-usr-share.diff +# allow to bundle the help icons even when help is built separately +Patch4: build-help-common.diff # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build # FIXME: make it configurable and push upstream @@ -603,6 +605,9 @@ 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 /share/template/common for language independent templates # FIXME: make it configurable to push upstream Patch9: office-cfg-linux-common-template-dir.diff @@ -1299,9 +1304,11 @@ the LibreOffice localizations separately. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %patch5 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 @@ -1382,7 +1389,7 @@ export PYTHON_LIBS=`python-config --libs` --with-external-hyph-dir=/usr/share/ooo/hyphen \ --with-external-thes-dir=/usr/share/ooo/thesaurus \ --without-doxygen \ - --without-help \ + --with-help=common \ %if %lo_build_sdk == yes --enable-odk \ %endif