diff --git a/.gitignore b/.gitignore index f0c03de..68a6bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ /libreoffice-5.3.0.0.beta2.tar.xz /libreoffice-help-5.3.0.0.beta2.tar.xz /libreoffice-translations-5.3.0.0.beta2.tar.xz +/libreoffice-5.3.0.1.tar.xz +/libreoffice-help-5.3.0.1.tar.xz +/libreoffice-translations-5.3.0.1.tar.xz diff --git a/0001-tdf-104339-Partially-revert-d5649ae7b76278cb3155f951.patch b/0001-tdf-104339-Partially-revert-d5649ae7b76278cb3155f951.patch deleted file mode 100644 index ae0730e..0000000 --- a/0001-tdf-104339-Partially-revert-d5649ae7b76278cb3155f951.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5903235d57acb13d9d5286d23b443a01aeab9a3c Mon Sep 17 00:00:00 2001 -From: Xisco Fauli -Date: Fri, 16 Dec 2016 14:52:18 +0100 -Subject: [PATCH] tdf#104339 Partially revert - d5649ae7b76278cb3155f951d6327157c7c92b65 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I5160c6efe7cf58351955d9d1d3066e3b33bdfe20 -Reviewed-on: https://gerrit.libreoffice.org/32082 -Tested-by: Jenkins -Reviewed-by: Xisco Faulí ---- - svgio/source/svgreader/svgstyleattributes.cxx | 19 +------------------ - 1 file changed, 1 insertion(+), 18 deletions(-) - -diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx -index 948f361..8cb6bb5 100644 ---- a/svgio/source/svgreader/svgstyleattributes.cxx -+++ b/svgio/source/svgreader/svgstyleattributes.cxx -@@ -2677,24 +2677,7 @@ namespace svgio - - OUString SvgStyleAttributes::getClipPathXLink() const - { -- if(mbIsClipPathContent) -- { -- return maClipPathXLink; -- } -- -- if(!maClipPathXLink.isEmpty()) -- { -- return maClipPathXLink; -- } -- -- const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle(); -- -- if(pSvgStyleAttributes && !pSvgStyleAttributes->maClipPathXLink.isEmpty()) -- { -- return pSvgStyleAttributes->getClipPathXLink(); -- } -- -- return OUString(); -+ return maClipPathXLink; - } - - const SvgClipPathNode* SvgStyleAttributes::accessClipPathXLink() const --- -2.9.3 - diff --git a/libreoffice.spec b/libreoffice.spec index 382a896..c50b327 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3,7 +3,7 @@ # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. -%define libo_prerelease .beta2 +%define libo_prerelease %{nil} # Should contain any suffix of release tarball name, e.g., -buildfix1. %define libo_buildfix %{nil} # rhbz#715152 state vendor @@ -54,8 +54,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.0 -Release: 8%{?libo_prerelease}%{?dist} +Version: %{libo_version}.1 +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 Artistic and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -234,7 +234,6 @@ Patch4: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch Patch5: 0001-change-from-glew-to-epoxy.patch Patch6: 0001-gtk3-implement-opengl-support-for-slideshow.patch Patch7: 0001-lower-the-system-epoxy-requirement.patch -Patch8: 0001-tdf-104339-Partially-revert-d5649ae7b76278cb3155f951.patch %if 0%{?rhel} # not upstreamed @@ -1998,6 +1997,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{baseinstdir}/program/resource/scen-US.res %{baseinstdir}/program/resource/solveren-US.res %{baseinstdir}/program/libvbaobjlo.so +%{baseinstdir}/share/calc/styles.xml %{baseinstdir}/share/registry/calc.xcd %{baseinstdir}/program/pagein-calc %{baseinstdir}/program/scalc @@ -2300,6 +2300,9 @@ done %endif %changelog +* Tue Jan 10 2017 David Tardon - 1:5.3.0.1-1 +- update to 5.3.0 rc1 + * Tue Dec 27 2016 Caolán McNamara - 1:5.3.0.0-8.beta1 - try arm build diff --git a/sources b/sources index f560aa4..9bb3bfa 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 -SHA512 (libreoffice-5.3.0.0.beta2.tar.xz) = 4fb5d9cac5ef4e7dad56bebc0bde493f1f2ee4f39cc6f3a1dcdfd65d774495dbb5c8c7848ecda3b26b1741561fa5eb999f06110576aa8a893a23290322473019 -SHA512 (libreoffice-help-5.3.0.0.beta2.tar.xz) = 0cb3d2f93f0ac6865a5bbd80cc1a214463c1a8c25e4d7ef7046d103851658cd93cef91fde53d8301c7ba7289f4af4dc3a4fbe91fa9f9aae8a287c106aafaab3e -SHA512 (libreoffice-translations-5.3.0.0.beta2.tar.xz) = 8fa509cd4afe183ed8858b7328645c90b472c093f0eccfb76c9ec3fac4475d71ddbd9676db6af0a16f42625181a5dd3531f5f583a61db44bbdc97c37d73b3111 +SHA512 (libreoffice-5.3.0.1.tar.xz) = 00f5ed3bd0b4f2359d199e498c3fff0724c9a268a9f17250d7e1a7ffcd1febe16b8c86dee31d3e49bddf1de79a992e05c486c95bb241d2292f99d4a3158722de +SHA512 (libreoffice-help-5.3.0.1.tar.xz) = e02cf479834c0dbeb8e7344bcf73169934dbf531f2ecfa325fa0079089294c08258adac9c57c44c8cbd15f31dfe7fc43f83af3b1930b2a86b426f45131eb69ec +SHA512 (libreoffice-translations-5.3.0.1.tar.xz) = ec907446f9288f16cc6f665b7b136c02ab08be54f7615d86e4ab0e157c6b2fd8603555808028d8f5f8c10e32e091adcdac3dc39c5442bccc05d9c2cc548080c8