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

Accepting request 224193 from LibreOffice:Factory

Browse Source 
- Uk does not have the mythes too in suse.

- Latvians do not have mythes so remove it from the dep.

- Fix installing of sdk symlinks needed for working 3rd party
  plugins.
- added patches:
  * fix-sdk-install.patch

- Version bump to 4.2.1:
  * Fixes over 100 found bugs found during the first release
    testing.

- remove duped pt-PT setting

- Fix vlc macro again (thanks rudi)
- Fix typo in description
- Fix nl and nn language subpackage incorrectly requiring
  unexisting thesaurus package.

- Try to provide other older translation packages to avoid
  various collisions as reported by repo-checker.

OBS-URL: https://build.opensuse.org/request/show/224193
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=58
This commit is contained in:
Stephan Kulow 2014-02-28 18:19:26 +00:00 committed by Git OBS Bridge
commit 14b35860f5
9 changed files with 344 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

271
fix-sdk-install.patch Normal file
View File

@ -0,0 +1,271 @@
diff --git a/Repository.mk b/Repository.mk
index 3977ac3..578ebd4c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -618,7 +618,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
endif
-$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
+$(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \
cppuhelper \
purpenvhelper \
salhelper \
@@ -632,7 +632,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
pythonloader \
))
-$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
+$(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \
cppu \
sal \
))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 1ec649d..d55c304 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -165,6 +165,28 @@
ComponentCondition = cond; \
End
+#ifdef MACOSX
+// links are craeted at configure time by odk/config/setsdkenv_unix.sh.in
+#define SDK_LIBRARY_LINK(id,name,target)
+#elif defined(WNT)
+#define SDK_LIBRARY_LINK(id,name,target) \
+ File id \
+ TXT_FILE_BODY; \
+ Styles = (PACKED); \
+ Dir = gid_Dir_Lib_Sdk; \
+ Name = name; \
+ End
+#else
+#define SDK_LIBRARY_LINK(id,name,target) \
+ Unixlink id \
+ BIN_FILE_BODY; \
+ Styles = (); \
+ Dir = gid_Dir_Lib_Sdk; \
+ Name = name; \
+ Target = target; \
+ End
+#endif
+
#define STD_LIB_FILE(id,name) \
File id \
Name = LIBNAME(name); \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3cf19c2..0fb18d9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -94,13 +94,6 @@ End
// Public Dynamic Libraries:
-File gid_File_Dl_Cppu
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_VER("cppu", "3");
- Styles = (PACKED);
-End
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Cppu
BIN_FILE_BODY;
@@ -111,13 +104,6 @@ Unixlink gid_Unixlink_File_Dl_Cppu
End
#endif
-File gid_File_Dl_Cppuhelper
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
- Styles = (PACKED);
-End
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Cppuhelper
BIN_FILE_BODY;
@@ -128,13 +114,6 @@ Unixlink gid_Unixlink_File_Dl_Cppuhelper
End
#endif
-File gid_File_Dl_PurpEnvHelper
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
- Styles = (PACKED);
-End
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
BIN_FILE_BODY;
@@ -145,13 +124,6 @@ Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
End
#endif
-File gid_File_Dl_Sal
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_VER("sal", "3");
- Styles = (PACKED);
-End
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Sal
BIN_FILE_BODY;
@@ -162,13 +134,6 @@ Unixlink gid_Unixlink_File_Dl_Sal
End
#endif
-File gid_File_Dl_Salhelper
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
- Styles = (PACKED);
-End
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Salhelper
BIN_FILE_BODY;
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index c03b664..f73e3e8 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -59,6 +59,11 @@ Directory gid_Dir_Sdkoo_Bin
DosName = "bin";
End
+Directory gid_Dir_Lib_Sdk
+ ParentID = gid_Dir_Sdkoo_Sdk;
+ DosName = "lib";
+End
+
Module gid_Module_Root_SDK
Name = "sdkoo";
Description = "sdkoo";
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index a754485..09f2378 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -24,9 +24,12 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI
echo "/* autogenerated installs for group $* */" > $@
$(call gb_AutoInstall__make_define,\
$(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \
+ $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),auto_$*_link_$(lib)) \
$(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)))
$(foreach lib,$(gb_Library_MODULE_$*),\
echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
+ $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
+ echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index a22f2f8..483aced 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -156,11 +156,15 @@ endef
# the first argument is the group, which sets rpaths etc.
# the second argument is the install module, which describes in which distro package/msi a lib should show up
+# UGLY: for versioned libraries "sdk" module is hard-coded for now
define gb_Helper_register_libraries_for_install
$(call gb_Helper_register_libraries,$(1),$(3))
gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3))
+$(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
+ gb_SdkLinkLibrary_MODULE_sdk += $(3))
+
endef
define gb_Helper_register_jars
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk
index aa16e0d..e0916b4 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -27,6 +27,7 @@ gb_PackageInfo_InstallModules := \
define gb_PackageInfo_emit_binaries_command
@touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/$(1).$(suf))
@$(foreach executable,$(gb_Executable_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Executable_get_target,$(executable)))" >> $(gb_PackageInfo_get_target)/$(1).executables &&) true
+@$(foreach library,$(gb_SdkLinkLibrary_MODULE_$(1)),echo "sdk/lib/$(call gb_Library_get_linktarget,$(library))" >> $(gb_PackageInfo_get_target)/$(1).sdklinklibraries &&) true
@$(foreach library,$(gb_Library_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Library_get_target,$(library)))" >> $(gb_PackageInfo_get_target)/$(1).libraries &&) true
endef
@@ -89,6 +90,10 @@ install-package-%: $(foreach filelist,files executables libraries,$(gb_PackageIn
do \
install -D $(INSTDIR)/$${executable} $(INSTALLDIR)/$${executable} ;\
done
+ for library in `cat $(gb_PackageInfo_get_target)/$*.sdklinklibraries`; \
+ do \
+ install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \
+ done
for library in `cat $(gb_PackageInfo_get_target)/$*.libraries`; \
do \
install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 4c5454c..603f0e0 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -348,6 +348,7 @@ define gb_Library_get_ilibfilename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES)))
endef
+gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target)
# StaticLibrary class
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c46cba1..cd5c0c3 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -246,6 +246,8 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
+gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target)
+
# bundle is a special kind of library that exists only on Darwin/OSX
# set the TARGETTYPE to Bundle, and clear install_name(RPATH)
define gb_Library_Bundle
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index ac5218c..870004f 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -265,6 +265,8 @@ define gb_Library_get_ilibfilename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES)))
endef
+gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target)
+
# Executable class
gb_Executable_EXT := .exe
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 2115a4a..8019fcd 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -273,6 +273,8 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
+gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target)
+
# Executable class
gb_Executable_EXT :=
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 75d5d21..1276e57 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -271,6 +271,7 @@ endef
gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
+gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target)
# Executable class
--
1.7.9.5

3
libreoffice-4.2.0.4.tar.xz
View File

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

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

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

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

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

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

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

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

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

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

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

45
libreoffice.changes
View File

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Fri Feb 28 09:11:39 UTC 2014 - tchvatal@suse.com
- Uk does not have the mythes too in suse.
-------------------------------------------------------------------
Thu Feb 27 09:49:11 UTC 2014 - tchvatal@suse.com
- Latvians do not have mythes so remove it from the dep.
-------------------------------------------------------------------
Wed Feb 26 14:32:01 UTC 2014 - tchvatal@suse.com
- Fix installing of sdk symlinks needed for working 3rd party
plugins.
- added patches:
* fix-sdk-install.patch
-------------------------------------------------------------------
Tue Feb 25 20:10:44 UTC 2014 - tchvatal@suse.com
- Version bump to 4.2.1:
* Fixes over 100 found bugs found during the first release
testing.
-------------------------------------------------------------------
Wed Feb 19 09:55:10 CET 2014 - tchvatal@suse.com
- remove duped pt-PT setting
-------------------------------------------------------------------
Wed Feb 12 13:34:12 UTC 2014 - fcrozat@suse.com
- Fix vlc macro again (thanks rudi)
- Fix typo in description
- Fix nl and nn language subpackage incorrectly requiring
unexisting thesaurus package.
-------------------------------------------------------------------
Wed Feb 12 10:25:31 UTC 2014 - tchvatal@suse.com
- Try to provide other older translation packages to avoid
various collisions as reported by repo-checker.
-------------------------------------------------------------------
Thu Feb 6 14:23:31 UTC 2014 - fcrozat@suse.com

35
libreoffice.spec
View File

@ -31,9 +31,9 @@
%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/4.2.0/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.1/
Name: libreoffice
Version: 4.2.0.4
Version: 4.2.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
@ -95,6 +95,8 @@ Patch12: mediawiki-no-broken-help.diff
Patch13: jvmfwk-disable-gcj.diff
# Fix running wizzards in py2 as the utf is not htere
Patch16: wizards-create-temlates-with-python-2.6.diff
# Fix ure links, will be fixed with next release
Patch17: fix-sdk-install.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: ImageMagick
@ -238,7 +240,7 @@ Provides: %{name}-l10n-prebuild = %{version}
Obsoletes: %{name}-l10n-prebuild < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
%if %{with_vlc}
%if %{with vlc}
BuildRequires: vlc-devel
%endif
# we need a JRE for oobase and the other stuff
@ -272,7 +274,7 @@ Some optional features are provided by extra packages, for example:
- libreoffice-kde
- libreoffice-gnome
Non-English localizations are provided by extra packges as well, for
Non-English localizations are provided by extra packages as well, for
example:
- libreoffice-l10n-de
@ -764,7 +766,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l de -n German -M -T -X
%langpack -l dz -n Dzongkha -s ctl -T
%langpack -l el -n Greek -M -T
%langpack -l en -n English -m en-US -L en-US -T -X
%langpack -l en -n English -m en-US -L en-US -T -X -p en-GB -p en-ZA
%langpack -l es -n Spanish -M -T -X
%langpack -l et -n Estonian -T
%langpack -l eu -n Basque -T
@ -773,9 +775,9 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l fr -n French -M -T -X
%langpack -l ga -n Irish -M
%langpack -l gl -n Galician -T
%langpack -l gu -n Gujarati -s ctl -T
%langpack -l gu -n Gujarati -s ctl -T -p gu-IN
%langpack -l he -n Hebrew -s ctl -T
%langpack -l hi -n Hindi -s ctl -T
%langpack -l hi -n Hindi -s ctl -T -p hi-IN
%langpack -l hr -n Croatian -T
%langpack -l hu -n Hungarian -M -T -X
%langpack -l it -n Italian -M -T -X
@ -784,23 +786,23 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l kn -n Kannada
%langpack -l ko -n Korean -s cjk -T -c korea -X
%langpack -l lt -n Lithuanian
%langpack -l lv -n Latvian -M
%langpack -l lv -n Latvian
%langpack -l mai -n Maithili
%langpack -l ml -n Malayalam
%langpack -l mr -n Marathi
%langpack -l nb -n Bokmal -M -T
%langpack -l nl -n Dutch -M -T -X
%langpack -l nn -n Nynorsk -M -T
%langpack -l nl -n Dutch -T -X
%langpack -l nn -n Nynorsk -T
%define langpack_lang Southern Ndebele
%langpack -l nr -n %{langpack_lang}
%define langpack_lang Northern Sotho
%langpack -l nso -n %{langpack_lang}
%langpack -l or -n Odia -s ctl
%langpack -l pa -n Punjabi -s ctl -L pa-IN
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN
%langpack -l pl -n Polish -M -T -X
%define langpack_lang Brazilian Portuguese
%langpack -l pt-BR -n %{langpack_lang} -m pt -p pt_BR -T -X
%langpack -l pt-PT -n Portuguese -m pt -p pt_PT -T -L pt -x pt
%langpack -l pt-PT -n Portuguese -m pt -T -L pt -x pt
%langpack -l ro -n Romanian -M
%langpack -l ru -n Russian -M -T -X
%langpack -l si -n Sinhalese -S ctl -T
@ -817,13 +819,13 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l tn -n Tswana
%langpack -l tr -n Turkish -T -X
%langpack -l ts -n Tsonga
%langpack -l uk -n Ukrainian -M -T
%langpack -l uk -n Ukrainian -T
%langpack -l ve -n Venda
%langpack -l xh -n Xhosa
%define langpack_lang Simplified Chinese
%langpack -l zh-Hans -n %{langpack_lang} -p zh_CN -s cjk -T -L zh-CN -x zh-CN
%langpack -l zh-Hans -n %{langpack_lang} -p zh-CN -s cjk -T -L zh-CN -x zh-CN
%define langpack_lang Traditional Chinese
%langpack -l zh-Hant -n %{langpack_lang} -p zh_TW -s cjk -T -L zh-TW -x zh-TW
%langpack -l zh-Hant -n %{langpack_lang} -p zh-TW -s cjk -T -L zh-TW -x zh-TW
%langpack -l zu -n Zulu
%undefine langpack_lang
@ -838,6 +840,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch12
%patch13 -p1
%patch16 -p1
%patch17 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}
@ -963,7 +966,7 @@ export NOCONFIGURE=yes
--enable-scripting-javascript \
--enable-telepathy \
--enable-opengl \
%if %{with_vlc}
%if %{with vlc}
--enable-vlc \
%endif
--enable-neon \