From 9302e69c93e5d905f3babd8bd896ef584803ad5f6b88055cca8f545744aeed4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 12 Mar 2019 10:21:52 +0000 Subject: [PATCH] - Update to 6.2.2.1 bsc#1128845: * bundle of 6.2 series fixes - Remove merged patches: * 0001-Speed-up-languagepack-installation.patch * kde5-32bit-build-fix.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=767 --- 0001-Speed-up-languagepack-installation.patch | 147 ------------------ kde5-32bit-build-fix.patch | 13 -- libreoffice-6.2.1.2.tar.xz | 3 - libreoffice-6.2.1.2.tar.xz.asc | 16 -- libreoffice-6.2.2.1.tar.xz | 3 + libreoffice-6.2.2.1.tar.xz.asc | 16 ++ libreoffice-help-6.2.1.2.tar.xz | 3 - libreoffice-help-6.2.1.2.tar.xz.asc | 16 -- libreoffice-help-6.2.2.1.tar.xz | 3 + libreoffice-help-6.2.2.1.tar.xz.asc | 16 ++ libreoffice-translations-6.2.1.2.tar.xz | 3 - libreoffice-translations-6.2.1.2.tar.xz.asc | 16 -- libreoffice-translations-6.2.2.1.tar.xz | 3 + libreoffice-translations-6.2.2.1.tar.xz.asc | 16 ++ libreoffice.changes | 9 ++ libreoffice.spec | 6 +- 16 files changed, 67 insertions(+), 222 deletions(-) delete mode 100644 0001-Speed-up-languagepack-installation.patch delete mode 100644 kde5-32bit-build-fix.patch delete mode 100644 libreoffice-6.2.1.2.tar.xz delete mode 100644 libreoffice-6.2.1.2.tar.xz.asc create mode 100644 libreoffice-6.2.2.1.tar.xz create mode 100644 libreoffice-6.2.2.1.tar.xz.asc delete mode 100644 libreoffice-help-6.2.1.2.tar.xz delete mode 100644 libreoffice-help-6.2.1.2.tar.xz.asc create mode 100644 libreoffice-help-6.2.2.1.tar.xz create mode 100644 libreoffice-help-6.2.2.1.tar.xz.asc delete mode 100644 libreoffice-translations-6.2.1.2.tar.xz delete mode 100644 libreoffice-translations-6.2.1.2.tar.xz.asc create mode 100644 libreoffice-translations-6.2.2.1.tar.xz create mode 100644 libreoffice-translations-6.2.2.1.tar.xz.asc diff --git a/0001-Speed-up-languagepack-installation.patch b/0001-Speed-up-languagepack-installation.patch deleted file mode 100644 index df91ac8..0000000 --- a/0001-Speed-up-languagepack-installation.patch +++ /dev/null @@ -1,147 +0,0 @@ -From d2763829435b7a30baebab939e1e04a94cce722b Mon Sep 17 00:00:00 2001 -From: Michael Schroeder -Date: Mon, 25 Feb 2019 13:28:14 +0100 -Subject: [PATCH] Speed up languagepack installation - -Reorder the order the filelists are initialized per package. -Optimize speed of find_files_for_package: - We can simply check if the modules entry is the same as last time. - The code uses iterators instead of that C-ish for loops. - Create a hash from the packagemodules to speed up the check if - a module is included in the hash. - -Change-Id: I1e8ae394634a527880e08ef8ff333d94d04f49fd -Before: 12s per language/package -After: <1s per language/package ---- - solenv/bin/modules/installer.pm | 26 +++++------ - solenv/bin/modules/installer/packagelist.pm | 52 ++++++++++----------- - 2 files changed, 37 insertions(+), 41 deletions(-) - -diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm -index 88ec4e9394f9..f7983673f2e8 100644 ---- a/solenv/bin/modules/installer.pm -+++ b/solenv/bin/modules/installer.pm -@@ -998,14 +998,23 @@ sub run { - $packagerootpath = $installer::globals::rootpath; - } - -+ ################################# -+ # collecting items for package -+ ################################# -+ -+ my $filesinpackage = installer::packagelist::find_files_for_package($filesinproductlanguageresolvedarrayref, $onepackage); -+ my $unixlinksinpackage = installer::packagelist::find_files_for_package($unixlinksinproductlanguageresolvedarrayref, $onepackage); -+ my $linksinpackage = installer::packagelist::find_links_for_package($linksinproductlanguageresolvedarrayref, $onepackage); -+ my $dirsinpackage = installer::packagelist::find_dirs_for_package($directoriesforepmarrayref, $onepackage); -+ - ############################################# - # copying the collectors for each package - ############################################# - -- my $filesinpackage = installer::converter::copy_collector($filesinproductlanguageresolvedarrayref); -- my $linksinpackage = installer::converter::copy_collector($linksinproductlanguageresolvedarrayref); -- my $unixlinksinpackage = installer::converter::copy_collector($unixlinksinproductlanguageresolvedarrayref); -- my $dirsinpackage = installer::converter::copy_collector($directoriesforepmarrayref); -+ $filesinpackage = installer::converter::copy_collector($filesinpackage); -+ $linksinpackage = installer::converter::copy_collector($linksinpackage); -+ $unixlinksinpackage = installer::converter::copy_collector($unixlinksinpackage); -+ $dirsinpackage = installer::converter::copy_collector($dirsinpackage); - - ########################################### - # setting the root path for the packages -@@ -1016,15 +1025,6 @@ sub run { - installer::scriptitems::add_rootpath_to_links($linksinpackage, $packagerootpath); - installer::scriptitems::add_rootpath_to_files($unixlinksinpackage, $packagerootpath); - -- ################################# -- # collecting items for package -- ################################# -- -- $filesinpackage = installer::packagelist::find_files_for_package($filesinpackage, $onepackage); -- $unixlinksinpackage = installer::packagelist::find_files_for_package($unixlinksinpackage, $onepackage); -- $linksinpackage = installer::packagelist::find_links_for_package($linksinpackage, $filesinpackage); -- $dirsinpackage = installer::packagelist::find_dirs_for_package($dirsinpackage, $onepackage); -- - ############################################### - # nothing to do, if $filesinpackage is empty - ############################################### -diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm -index 14daf9907507..a0e1da760b44 100644 ---- a/solenv/bin/modules/installer/packagelist.pm -+++ b/solenv/bin/modules/installer/packagelist.pm -@@ -239,47 +239,43 @@ sub find_files_for_package - { - my ($filelist, $onepackage) = @_; - -- my @newfilelist = (); -+ my @newfilelist; -+ my $lastmodules = ''; -+ my $lastincludefile = 0; - -- for ( my $i = 0; $i <= $#{$filelist}; $i++ ) -+ my %packagemodules = map {$_ => 1} @{$onepackage->{'allmodules'}}; -+ -+ for my $onefile (@$filelist) - { -- my $onefile = ${$filelist}[$i]; - my $modulesstring = $onefile->{'modules'}; # comma separated modules list -+ -+ # check if the modules string is the same as in the last file -+ if ($modulesstring eq $lastmodules) -+ { -+ push(@newfilelist, $onefile) if $lastincludefile; -+ next; -+ } -+ - my $moduleslist = installer::converter::convert_stringlist_into_array(\$modulesstring, ","); - - my $includefile = 0; - - # iterating over all modules of this file -- -- for ( my $j = 0; $j <= $#{$moduleslist}; $j++ ) -- { -- if ( $includefile ) { next; } -- my $filemodule = ${$moduleslist}[$j]; -+ for my $filemodule (@$moduleslist) { - installer::remover::remove_leading_and_ending_whitespaces(\$filemodule); -- -- # iterating over all modules of the package -- -- my $packagemodules = $onepackage->{'allmodules'}; -- -- for ( my $k = 0; $k <= $#{$packagemodules}; $k++ ) -- { -- if ( $includefile ) { next; } -- my $packagemodule = ${$packagemodules}[$k]; -- -- if ( $filemodule eq $packagemodule ) -- { -- $includefile = 1; -- last; -- } -+ if ($packagemodules{$filemodule}) { -+ $includefile = 1; -+ last; - } - } - -- if ( $includefile ) -- { -- push(@newfilelist, $onefile); -- } -- } -+ push(@newfilelist, $onefile) if $includefile; -+ -+ # cache last result for this modules list -+ $lastmodules = $modulesstring; -+ $lastincludefile = $includefile; - -+ } - return \@newfilelist; - } - --- -2.20.1 - diff --git a/kde5-32bit-build-fix.patch b/kde5-32bit-build-fix.patch deleted file mode 100644 index d35ee47..0000000 --- a/kde5-32bit-build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx -index 5d40a7de39ab..d8d35b2f90b5 100644 ---- a/vcl/unx/kde5/KDE5FilePicker2.cxx -+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx -@@ -661,7 +661,7 @@ uno::Any KDE5FilePicker::handleGetListValue(QComboBox* pQComboBox, sal_Int16 nAc - case ControlActions::GET_SELECTED_ITEM_INDEX: - { - int nCurrent = pQComboBox->currentIndex(); -- aAny <<= nCurrent; -+ aAny <<= static_cast(nCurrent); - } - break; - default: diff --git a/libreoffice-6.2.1.2.tar.xz b/libreoffice-6.2.1.2.tar.xz deleted file mode 100644 index 6af8f37..0000000 --- a/libreoffice-6.2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1d4fc442e21a163cd4a4e356b94ac99865d1d02b2d36e472b1ec232c22595c -size 213885668 diff --git a/libreoffice-6.2.1.2.tar.xz.asc b/libreoffice-6.2.1.2.tar.xz.asc deleted file mode 100644 index e590c39..0000000 --- a/libreoffice-6.2.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx1ZjwACgkQ9DSh76/u -rqNm1hAAg1Wz+ugWajhP6Hm+mcpsitjavbNIHt0i2zZ6iGgC+yYmEFI3fqpC7Xbe -ifa0rORIgLyyO6uVmPtYX9k43Nf3QCG9lTgovbQB5fDkUyoUVsiiyU+1zOSXhR5B -GJT3D1Uc1XUB4Vf/p1OjLjd6atHW1k7hT1VkgQl7OZm7wZemtvKuDFuS/Icet+ye -cnDQORxsIfk9iLduh7W4stWrxrtw0KSsRq9X7pNw73auN12bDLmqosd3a8s9A9oO -3drvC3sJpgBdkMT7+FBH+Lho1LSnkTwFpC6zrnDHIAkg+46R+dETjhJ3pFVv8rSg -4dSS3COmulpogFj+Un/jJgAzE1/OSoW1rpSY7wUivTitgcwU11QBHyQzj9b8SugC -6Li2w0oJi4XBGZvLqjjJJNerd5iccIFDQEJG+Mj2rHfeHVE24rThRBTtD6lyjSVM -Hb7+b/DVkDRPSOlnZu3XDKrdpQ6DimiRGJFsQK3o8phNpizl78xbZy/EVKhXoepu -VvtyRGoJImNqtWq2MVt5w0Hb5hq/qADZcu/rbeZfjHcxwMw2R74a+dwmo7cRbA5p -nEVM208N0AhFRhGX9tQ7Dnfqxtk3B/mhNO7bK5wkHdHaZj8fcZ04COLl0Y5XFj1U -09xnzD9R5cp4NcXbceGnmVj0WyDHMav31Xt/TA+Y4BCG9JR0w0c= -=mUmP ------END PGP SIGNATURE----- diff --git a/libreoffice-6.2.2.1.tar.xz b/libreoffice-6.2.2.1.tar.xz new file mode 100644 index 0000000..48c1028 --- /dev/null +++ b/libreoffice-6.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1dede48c4891019126fb7e3cf0d36a7fa422730435ff64b4127c727973371cd +size 214021928 diff --git a/libreoffice-6.2.2.1.tar.xz.asc b/libreoffice-6.2.2.1.tar.xz.asc new file mode 100644 index 0000000..818480e --- /dev/null +++ b/libreoffice-6.2.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx9T/EACgkQ9DSh76/u +rqN8vQ/9HbmIliP9MIgM5DmATLJdxXktJAC4T6Qlv2THWVbPMPIVqAeHavfU6joH +iH2SB1/yGeRAzphHKfoI4yCRISz23erBOkybH18B49AeVu6vJ2egyId4JeuvUMNn +5J4dmBJ231Yrm1DX9fIgD0fNrpyumr2weJIp8DTzfUZO4fN7EAn6le7hUule5iRg +MAp5OBhECcyQ5KLQsA338Iw2QUGYUOXER6g3xZm9UzRMXZOXyym8pBbRdOvh+Yhx ++7t2IVGHzH0vX9JC8ncvUQZ+z6fltba6Pvh2wFE5C79uYT6OJvjUhALV1QYa3FF+ +2d5JyQNamWCAvnYn6rr1/v4o3aq72M/ByJWodNtdjhaQpZ3F16K42yLf+vFO8z0+ +/BjBCpsWMkALPtOTa85JM3JnqR5SkLUaovxE5hHxpE52B8C0B14v3wDmTqPvPmj9 +UXsoyvddLypmObm+ejb5uoz+4ofwJGUU68MYN6SNObQykAjhcJrqKWCN7yOmh6Iw +ieE+RmxxhherDF3TpyTvmcohUBMjQrljs9P/bRa5fCH8girOFY6Qom4RUMxeoiua +IO6GlMSfL7vFqly/9AHTFCde4jja4SF+mMB8BFYTyzWu4LSI364fPyzSWH9H3dgN +z/TQWTkn7cVrALsNyx799Hy6EJvB1fBljlEE2RHZEsDg4ghGcb0= +=VUTs +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.2.1.2.tar.xz b/libreoffice-help-6.2.1.2.tar.xz deleted file mode 100644 index 4803747..0000000 --- a/libreoffice-help-6.2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3444086cf346a20c76b68564a4890152674656d595fb20fdd47b613c6569cf19 -size 16187168 diff --git a/libreoffice-help-6.2.1.2.tar.xz.asc b/libreoffice-help-6.2.1.2.tar.xz.asc deleted file mode 100644 index 0acd95d..0000000 --- a/libreoffice-help-6.2.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx1ZkAACgkQ9DSh76/u -rqPJ/hAA0HIhhWx6wW9oPn1V+d2wmBnI9ZryPlUZ8InusyE8jt3rja7228iyhCP4 -zEv4nMApRmyQoSnqGjoxASZ96qfvllWwdhliOod0Yg0C8UwIyyHRz6O9i3VlnFsR -lsiY7MmlOKHZmsx0pVeYAbZboSRf1b31twcyWSez9MrExcAHkVha+aSMzgCTcaq6 -1oDb5jDTT3P61lhyG5WGDmulpOFUAt7KjOyaRaGuyoskG6SdJK8XOPBjjkJv8ERZ -FPwI3jKQrw6oOhonyiAmgqdshvWLTVvOTqVEP77fjPmW4USbjPj7dgOoGVKTxeRf -kDM+CtT5bewwZxPckxFhnhTdKmTBRYHxpJ0s8J1yMJnbvITR8zWZfFr30t8hKfVy -HBZntYAooEv+NwyY/GqZmgB9Rb9uvikOzpucggh0v/XQu0Ykqsf56PhEU6MM8kvr -I8MZo7MtfnFFzu/6osH/z+T7tzkZ9vkrL2vgnM37B5azqBggkmpMUxhK4ItGyDrs -PAwSF4k16vRd8dMMJyIIvEG0k8+AYS/0bn/kH0bxxXS/Et1+Oe00TuMFxi6wFzlh -ecL2dLF5zeqhbqtEcZ+yMdYsLnjtWaihdNu3l7EJHU7+24EVcbqHHlV3vb+ftd1h -F10HZM4SeBojfRK/CQIXkkhkjbngXfqv7lKN/z24C+AOsj1xb7I= -=snSe ------END PGP SIGNATURE----- diff --git a/libreoffice-help-6.2.2.1.tar.xz b/libreoffice-help-6.2.2.1.tar.xz new file mode 100644 index 0000000..310ab54 --- /dev/null +++ b/libreoffice-help-6.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46a4d2d21014ee1bad72caeca0df32214fba3731713d4b64205b48cded1e280c +size 15267328 diff --git a/libreoffice-help-6.2.2.1.tar.xz.asc b/libreoffice-help-6.2.2.1.tar.xz.asc new file mode 100644 index 0000000..a350551 --- /dev/null +++ b/libreoffice-help-6.2.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx9T/kACgkQ9DSh76/u +rqNaUA//aWKi8+1X51ewDsnUKE9KGloHysfZx0IePISHllW1SgzVC943kotknPRR +2a3RX6QtGO6NTmKIAS3BVq+PZwZxejahpxm+Huk/Mt5qO1dR/H/xa1eaop1npmty +c8EZnJuWF/G064vKCTpOVOvmUlMsRC7hxKNGnU45lTsyTZt5qIGmKk3XCe3XX/xG +IGiBTErVSn3hNOaq4id8apkynTzSq3Lo/qtZAJcZAZNosJ1OSX6XwXrlghssT1Uf +/uddMkZusUi2Mt7YRgdLf6yt0YxfW5vw7Mais1obp9e/iQdKPamh2soPzFv2TDb4 +zwPA2cHAh7m6L9mM5U1h4Y/xGjJ5dIqpA/2MQXcg7UnHfuwmZLW3sEadjCoV2t4i +oURwC49E07dGb5dC47reW4OpKEg2habYed1rXZUZFKGy+iGsTXhqLUe17C0I8NIx +/kYhnj7IjGltW8MoV15sc9vv2OS6iOgxnuV5HLth5+2qm2r+25WGr+yDHQ2HsHUa +k6kVa2ZxEXJRCV3cZ3iLHSIjYhb6/LmhCXRFBFSR+c/lJiy/qPkIiUtabIxa4LIN +324y5MIx/CKAZaMtjrVbwjhCG7LRFt3uaG0cyvYlOYO7EiXTJzajYuRYqUsvE1v1 +Eg36lggFLwz/Ka9+R2wP6rZ+2ThZf1ENNrm73WMd8yWwFK0bqRM= +=VNac +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.2.1.2.tar.xz b/libreoffice-translations-6.2.1.2.tar.xz deleted file mode 100644 index 7f51b4a..0000000 --- a/libreoffice-translations-6.2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be2e48e40ce14d68649e118846c993d34186ac13a1f4c3c53b988ef573260da0 -size 141790536 diff --git a/libreoffice-translations-6.2.1.2.tar.xz.asc b/libreoffice-translations-6.2.1.2.tar.xz.asc deleted file mode 100644 index 82f76de..0000000 --- a/libreoffice-translations-6.2.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx1ZkEACgkQ9DSh76/u -rqM9ng/+LF7MgBKdLHgdUmJ31OjsKk4FfrcvQGP2scivA0tYmLm7tAgzlAm2t4fj -n3VsFKuIGg6LMHOKvmYw+pKrwBj7gg8jBlzCWgoamYbu03fB//bQJsywsju5f9rB -amLKiOyTZIDGToDgH+ekgSjZBMGyQq/M3oLvj71e1bJx6hRtx+E9Cu9D/ff9644w -HmiNUtuv4ibiC7xy+f8gjHV2VqyQZJjgzyDj8tigrzLTeLxK0eKkK0TfaFNhlOg1 -DPR1pFNk9KkuuFEwGfkzLURkjF7R/55ljNfqA2gghFi9qwObGHEAipuemOOtwqR+ -gpbIFWZNgHD/V8qV3YfmH0s4TOt+mKd/nFrpI+v5ThQi7MJB9XvX9MzP+lcbYaMy -OFm4dhI1frGHwARpGZo/kQ/v2gKF3VUKWaF65bEv36rKD9hgn9jBZM+K+iDbYZ9Q -kudTvpvdbqE7x8U7MEd3ao6dMf5h3VFDqv0ihtKjkkKlWjAg3U6G+moWtGOSUtlh -1CQHjZhihyt/WiGH37Fa8SdAh8X1sNSdgGTS83FYqH6Hr3XtqJNFpzRvIcOdZYd2 -VVN8Eob+aqYudzQYXrnn4ziHTlA/2h3ZOPASREk45qiN9K0S+UVVSlGGW2ZTIzUD -pHS+hEGw2Cc3QpOWl+2FRjav7MfOkVmYvfgMUKpX/kcOXX7B4QY= -=QrBL ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.2.2.1.tar.xz b/libreoffice-translations-6.2.2.1.tar.xz new file mode 100644 index 0000000..1d2f008 --- /dev/null +++ b/libreoffice-translations-6.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:106c66c26d049c99ae4d1b266bce9866ccae6da33412729751bd056726eb0355 +size 141855216 diff --git a/libreoffice-translations-6.2.2.1.tar.xz.asc b/libreoffice-translations-6.2.2.1.tar.xz.asc new file mode 100644 index 0000000..7c04e43 --- /dev/null +++ b/libreoffice-translations-6.2.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx9T/oACgkQ9DSh76/u +rqNvhw/6AtxBjHPtWRmbi8phmYjAD0qVPEklRD6HDNG6gEoyGDpck1u4I3MU4Qd5 +tKABcVxsAITKkPik87Uwo4uItCGVbgIxAhxYWslyJQgp8Uz0TiJNOJMZthdZjrXw +P5kokF45ZW6CiGUbvru5JqDVvgfnCzB5y6lmiuwbTfasTmJt+nhzbNYJPP1fAR6z +0epeaaKx9RcaRLtGH6q7fIb3zTSR2d24mA6uxj/JrGCRBSkd03Jh6B05jNxw92s/ +EY4fClrUpxCvflb+HLd9+LVD6MdeMocNQ3tCHvEZwkMg6TNM6bAurmLi25aVPRwg +uX1G6UI+7F9pgv7km/gnDfbcchBKehZpKkU9Z1J4cCf2bxpidvlDEbZYlulZZU+F +n5AJXxe8lfta2Yo5yd53pPZCoKTs6B4V60A3tqPOw5vUBFGC3kKgvtBO6r3w90jy +nwM2w0PpFxBUEBYxk1+nURZbDzvWFKD71fycrWOEl3fzcQQHe8iOUS+e0pHsHIdT +VKTGeX1dDZfURaSaEhvoJIhyeegBZVN6LzJJ2a2F1m5E1rNgNL0Co+RjSoNx238p +7wx7EXAtP380s4s4NL/bxScwxsNoVuBaenwB1um6HPa9LcPN2NNUyGfq7wEmXZuR +eiexSGA9wp7K7XppV2KQ7sdMWey8Fpg6XMmbxwQrldQ4gM4qlvk= +=EdQS +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 2942192..b69bda0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 12 10:07:34 UTC 2019 - Tomáš Chvátal + +- Update to 6.2.2.1 bsc#1128845: + * bundle of 6.2 series fixes +- Remove merged patches: + * 0001-Speed-up-languagepack-installation.patch + * kde5-32bit-build-fix.patch + ------------------------------------------------------------------- Sun Mar 10 15:51:32 UTC 2019 - Adam Majer diff --git a/libreoffice.spec b/libreoffice.spec index 1ca7387..a1e9487 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.2.1.2 +Version: 6.2.2.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -99,9 +99,7 @@ Patch1: scp2-user-config-suse.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: 0001-Speed-up-languagepack-installation.patch Patch5: old-boost.patch -Patch6: kde5-32bit-build-fix.patch Patch7: libreoffice-postgresql.patch Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch Patch9: boost_169.patch @@ -967,9 +965,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 %patch8 -p1 %patch9 -p1