diff --git a/.gitignore b/.gitignore index bb676de..889eab3 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,9 @@ /libreoffice-help-6.0.3.1.tar.xz.asc /libreoffice-translations-6.0.3.1.tar.xz /libreoffice-translations-6.0.3.1.tar.xz.asc +/libreoffice-6.0.3.2.tar.xz +/libreoffice-6.0.3.2.tar.xz.asc +/libreoffice-help-6.0.3.2.tar.xz +/libreoffice-help-6.0.3.2.tar.xz.asc +/libreoffice-translations-6.0.3.2.tar.xz +/libreoffice-translations-6.0.3.2.tar.xz.asc diff --git a/0001-sdk-lib-dir-missing-from-Linux-installation-sets.patch b/0001-sdk-lib-dir-missing-from-Linux-installation-sets.patch deleted file mode 100644 index 99ef070..0000000 --- a/0001-sdk-lib-dir-missing-from-Linux-installation-sets.patch +++ /dev/null @@ -1,124 +0,0 @@ -From f07e2496963baf8f7c0fecc79e7a420544075d98 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Fri, 16 Mar 2018 14:21:01 +0100 -Subject: [PATCH] sdk/lib dir missing from Linux installation sets - -...after cfd2691e5bf398304d7816227b933e53907b6204 "[API CHANGE] Remove salcpprt -static library" had removed the sole regular File item from gid_Dir_Lib_Sdk, -leaving only Unixlink items. But the solenv/bin/modules/installer.pm code used -to only auto-create any directories that contain regular Files. Changed that to -also consider Unixlinks in addition to regular Files. - -And to add insult to injury, the code in -solenv/bin/modules/installer/simplepackage.pm creating the actual symlinks -represented by the Unixlink items silently does nothing when a symlink cannot be -created (because the partent dir is missing). To be fixed in another follow-up -commit. - -Change-Id: Ic7a682a17ac59c789c85c56c825dd623bc59428c ---- - solenv/bin/modules/installer.pm | 31 ++++++++++++++--------------- - solenv/bin/modules/installer/scriptitems.pm | 9 ++++++--- - 2 files changed, 21 insertions(+), 19 deletions(-) - -diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm -index cd72284c5bc8..b11e55b09077 100644 ---- a/solenv/bin/modules/installer.pm -+++ b/solenv/bin/modules/installer.pm -@@ -632,6 +632,18 @@ sub run { - - installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref); - -+ ######################################################### -+ # language dependent unix links part -+ ######################################################### -+ -+ installer::logger::print_message( "... analyzing unix links ...\n" ); -+ -+ my $unixlinksinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($unixlinksinproductarrayref, $languagesarrayref); -+ -+ installer::scriptitems::changing_name_of_language_dependent_keys($unixlinksinproductlanguageresolvedarrayref); -+ -+ installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($unixlinksinproductlanguageresolvedarrayref, $dirsinproductarrayref); -+ - ############################################ - # Collecting directories for epm list file - ############################################ -@@ -645,8 +657,7 @@ sub run { - # It will be possible, that in the setup script only those directoies have to be defined, - # that have a CREATE flag. All other directories are created, if they contain at least one file. - -- my ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref); -- -+ my ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref, $unixlinksinproductlanguageresolvedarrayref); - ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash); - - ######################################################### -@@ -685,18 +696,6 @@ sub run { - - installer::scriptitems::resolve_links_with_flag_relative($linksinproductlanguageresolvedarrayref); - -- ######################################################### -- # language dependent unix links part -- ######################################################### -- -- installer::logger::print_message( "... analyzing unix links ...\n" ); -- -- my $unixlinksinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($unixlinksinproductarrayref, $languagesarrayref); -- -- installer::scriptitems::changing_name_of_language_dependent_keys($unixlinksinproductlanguageresolvedarrayref); -- -- installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($unixlinksinproductlanguageresolvedarrayref, $dirsinproductarrayref); -- - ######################################################### - # language dependent part for profiles and profileitems - ######################################################### -@@ -810,7 +809,7 @@ sub run { - @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in languagepacks - - # Collecting the directories again, to include only the language specific directories -- ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref); -+ ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref, $unixlinksinproductlanguageresolvedarrayref); - ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash); - @$directoriesforepmarrayref = sort { $a->{"HostName"} cmp $b->{"HostName"} } @$directoriesforepmarrayref; - -@@ -831,7 +830,7 @@ sub run { - @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in helppacks - - # Collecting the directories again, to include only the language specific directories -- ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref); -+ ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref, $unixlinksinproductlanguageresolvedarrayref); - ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash); - @$directoriesforepmarrayref = sort { $a->{"HostName"} cmp $b->{"HostName"} } @$directoriesforepmarrayref; - -diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm -index b9572dcb27dc..01f29f067198 100644 ---- a/solenv/bin/modules/installer/scriptitems.pm -+++ b/solenv/bin/modules/installer/scriptitems.pm -@@ -1584,7 +1584,10 @@ sub optimize_list - - sub collect_directories_from_filesarray - { -- my ($filesarrayref) = @_; -+ my ($filesarrayref, $unixlinksarrayref) = @_; -+ my @allfiles; -+ push @allfiles, @{$filesarrayref}; -+ push @allfiles, @{$unixlinksarrayref}; - - my @alldirectories = (); - my %alldirectoryhash = (); -@@ -1594,9 +1597,9 @@ sub collect_directories_from_filesarray - # Preparing this already as hash, although the only needed value at the moment is the HostName - # But also adding: "specificlanguage" and "Dir" (for instance gid_Dir_Program) - -- for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) -+ for ( my $i = 0; $i <= $#allfiles; $i++ ) - { -- my $onefile = ${$filesarrayref}[$i]; -+ my $onefile = $allfiles[$i]; - my $destinationpath = $onefile->{'destination'}; - installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath); - $destinationpath =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes or backslashes --- -2.14.3 - diff --git a/libreoffice.spec b/libreoffice.spec index aa1265c..f8470ff 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -61,8 +61,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 3%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -198,6 +198,7 @@ BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) BuildRequires: pkgconfig(libodfgen-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libvisio-0.1) @@ -218,7 +219,6 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) -BuildRequires: postgresql-devel BuildRequires: unixODBC-devel # libs / headers - conditional @@ -274,8 +274,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch3: 0001-gtk3-only-for-3.20.patch Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch Patch5: 0001-request-installation-of-langpack-via-packagekit.patch -Patch6: 0001-sdk-lib-dir-missing-from-Linux-installation-sets.patch -Patch7: 0001-rhbz-1392145-ensure-titlebar-close-button-matches-ou.patch +Patch6: 0001-rhbz-1392145-ensure-titlebar-close-button-matches-ou.patch %if 0%{?rhel} # not upstreamed @@ -559,7 +558,6 @@ Summary: PostgreSQL connector for LibreOffice Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} -Requires: postgresql-libs%{?_isa} %description postgresql A PostgreSQL connector for the database front-end for LibreOffice. Allows @@ -2327,6 +2325,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Mar 29 2018 Caolán McNamara - 1:6.0.3.2-1 +- latest version + * Thu Mar 29 2018 Caolán McNamara - 1:6.0.3.1-3 - Related: rhbz#1066844 drop libreofficekit requires diff --git a/sources b/sources index de4f5fe..4e1e813 100644 --- a/sources +++ b/sources @@ -6,9 +6,9 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6 -SHA512 (libreoffice-6.0.3.1.tar.xz.asc) = a83e53000a3004b67f7c37e088acd7c96047656cf973d20f4c0d5d4e862ffbbf0746efe8db8e47d678457ee3fcdf9474735536172d5abf9013c5b0e010361008 -SHA512 (libreoffice-help-6.0.3.1.tar.xz) = 1daad6f9374d0af75b04aa814ae72971aabb29732c9946566c462d51c07c831eeba6ef813eb2409e35b24c4a65dba3dc856e5e9626eb4aa342167377d8f07d18 -SHA512 (libreoffice-help-6.0.3.1.tar.xz.asc) = a67bc18415e7459048cb7a052f77453ae6570493bac5d7c624b5e1fe71765f9ed968f275d565c53be6b676fc1f05460e38b9e2488a91c6960bb0e186cb24fcce -SHA512 (libreoffice-translations-6.0.3.1.tar.xz) = a2689264f1397c9c0bba525a934707b15f09b4f0dad037a39b57d26335eadf25765027b8ccff645ed0ff0c5c19c0e726fcd30d5f24a58b29f3bccf5b6900c098 -SHA512 (libreoffice-translations-6.0.3.1.tar.xz.asc) = 6a7905adccd5af017c0f1458588973855857161e75eede8d29a7a54988bf08390772db46a2e879edf48aef58695bd1d26f98a9458f6752dca42166b5eacb38e9 -SHA512 (libreoffice-6.0.3.1.tar.xz) = 690ea719d36013ced81d76754b275a6baa34042bd9ff1d33ab10d5c855b1c49da3f49a8571cbbb35fb8655d7a74e8f789dbc9e227617d4918b7bb53fe7cb0f28 +SHA512 (libreoffice-6.0.3.2.tar.xz) = d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879 +SHA512 (libreoffice-6.0.3.2.tar.xz.asc) = b977a83cabcd7afb1c4083ef629597d23944cf76f8bd491c1c40c56a14e91c22ae2447414f274899058cdc7480c2cdf50873340ef11f5361a1a500a037a1e0cf +SHA512 (libreoffice-help-6.0.3.2.tar.xz) = cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40 +SHA512 (libreoffice-help-6.0.3.2.tar.xz.asc) = d6c61fdf8c65227ec350056b732eec8be31b8493995c87b86e44a6953b18944a0401a293038a8de56dddd9ae3d2dbfa817b6f0f91a6867061c5530b724973e47 +SHA512 (libreoffice-translations-6.0.3.2.tar.xz) = 96d6ebdb22192590a15478146d4a784de82985664a5d5fac791b53199f2680923a15ffdcf2d900b67b2bcd481c86113c09e887109eb27e2bc8d4a1134eac0eb0 +SHA512 (libreoffice-translations-6.0.3.2.tar.xz.asc) = e2e24f39613deed5b6f3fa86a7a28debe9c70c5bf2d90e1445efce3756aaa0ff5148a84239a1e9353dd1ee4af1ace3ee833b47d9b1f981df9fb97ea51cb000f2