From 60406a01a8c68899bcbfbd0400c814f4494247abff8f2bd29d2bd2b481adec03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 13 Mar 2014 15:04:38 +0000 Subject: [PATCH 1/2] - Version bump to 4.2.2 release: * Bugfix release of 4.2 series - Fixing 29 various issues and from it 16 most annoying ones OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=122 --- libreoffice-4.2.1.1.tar.xz | 3 --- libreoffice-4.2.2.1.tar.xz | 3 +++ libreoffice-help-4.2.1.1.tar.xz | 3 --- libreoffice-help-4.2.2.1.tar.xz | 3 +++ libreoffice-translations-4.2.1.1.tar.xz | 3 --- libreoffice-translations-4.2.2.1.tar.xz | 3 +++ libreoffice.changes | 7 +++++++ libreoffice.spec | 5 ++--- 8 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 libreoffice-4.2.1.1.tar.xz create mode 100644 libreoffice-4.2.2.1.tar.xz delete mode 100644 libreoffice-help-4.2.1.1.tar.xz create mode 100644 libreoffice-help-4.2.2.1.tar.xz delete mode 100644 libreoffice-translations-4.2.1.1.tar.xz create mode 100644 libreoffice-translations-4.2.2.1.tar.xz diff --git a/libreoffice-4.2.1.1.tar.xz b/libreoffice-4.2.1.1.tar.xz deleted file mode 100644 index 2cd2182..0000000 --- a/libreoffice-4.2.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:792f08639ef2a0a81dc1fa40ca52d35443844279f4f87af260e3c7414a312c57 -size 123167692 diff --git a/libreoffice-4.2.2.1.tar.xz b/libreoffice-4.2.2.1.tar.xz new file mode 100644 index 0000000..970807f --- /dev/null +++ b/libreoffice-4.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbd0c425ed17e6b55b8a3e764f267bdfd77b09c89e0f534ab1a87f635baabaf9 +size 123187640 diff --git a/libreoffice-help-4.2.1.1.tar.xz b/libreoffice-help-4.2.1.1.tar.xz deleted file mode 100644 index 4007724..0000000 --- a/libreoffice-help-4.2.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e6bb1386009d2487b0c1bb6b1d17e3b03d94547232d7cb3075aac690aaf3779 -size 1854972 diff --git a/libreoffice-help-4.2.2.1.tar.xz b/libreoffice-help-4.2.2.1.tar.xz new file mode 100644 index 0000000..089a54f --- /dev/null +++ b/libreoffice-help-4.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:386327350015642fd07e27c26c1545cd099119ea33a4bfd78d9b9472c5e659e9 +size 1855420 diff --git a/libreoffice-translations-4.2.1.1.tar.xz b/libreoffice-translations-4.2.1.1.tar.xz deleted file mode 100644 index bffa862..0000000 --- a/libreoffice-translations-4.2.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2a8eb0c708bfd6c9d6489c3387b38322ca71e5699a70ea9b5300fab5a34df1d -size 127512608 diff --git a/libreoffice-translations-4.2.2.1.tar.xz b/libreoffice-translations-4.2.2.1.tar.xz new file mode 100644 index 0000000..d0fa753 --- /dev/null +++ b/libreoffice-translations-4.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2a28562fba4c2135f201a3bc329708122cf01d8597455780d268c1b50ea19cf +size 127588320 diff --git a/libreoffice.changes b/libreoffice.changes index 2187439..f93a6fc 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 13 14:01:35 UTC 2014 - tchvatal@suse.com + +- Version bump to 4.2.2 release: + * Bugfix release of 4.2 series + - Fixing 29 various issues and from it 16 most annoying ones + ------------------------------------------------------------------- Wed Mar 12 12:02:55 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index ca4a440..a35624c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -22,7 +22,6 @@ %else %bcond_without vlc %endif - # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} # extensions @@ -31,9 +30,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.1/ +%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.2/ Name: libreoffice -Version: 4.2.1.1 +Version: 4.2.2.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 From 87e0ac361de8155a02d0e9518aa3e0101e3e767a05a6f36fbb3fed8604a23b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 13 Mar 2014 16:47:10 +0000 Subject: [PATCH 2/2] - Remove patch already applied upstream: * fix-sdk-install.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=123 --- fix-sdk-install.patch | 271 ------------------------------------------ libreoffice.changes | 6 + libreoffice.spec | 3 - 3 files changed, 6 insertions(+), 274 deletions(-) delete mode 100644 fix-sdk-install.patch diff --git a/fix-sdk-install.patch b/fix-sdk-install.patch deleted file mode 100644 index a98d373..0000000 --- a/fix-sdk-install.patch +++ /dev/null @@ -1,271 +0,0 @@ -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 - diff --git a/libreoffice.changes b/libreoffice.changes index f93a6fc..5f2671e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 13 16:46:54 UTC 2014 - tchvatal@suse.com + +- Remove patch already applied upstream: + * fix-sdk-install.patch + ------------------------------------------------------------------- Thu Mar 13 14:01:35 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a35624c..7a4be62 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -94,8 +94,6 @@ 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 @@ -839,7 +837,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch12 %patch13 -p1 %patch16 -p1 -%patch17 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}