From 3a4a43aa38f5ce7feab2001b1ceccca6030ccc23 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sep 05 2015 18:43:58 +0000 Subject: update to 5.0.2 rc1 --- diff --git a/.gitignore b/.gitignore index 03cd114..691563f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ /libreoffice-5.0.1.2.tar.xz /libreoffice-help-5.0.1.2.tar.xz /libreoffice-translations-5.0.1.2.tar.xz +/libreoffice-5.0.2.1.tar.xz +/libreoffice-help-5.0.2.1.tar.xz +/libreoffice-translations-5.0.2.1.tar.xz diff --git a/0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch b/0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch index 2914dfa..b801190 100644 --- a/0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch +++ b/0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch @@ -16,7 +16,7 @@ index cba0a75..aee9dd7 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -42,7 +42,10 @@ typedef std::set SdrUShortCont; - */ + // Everything a View needs to know about a selected object class SVX_DLLPUBLIC SdrMark : public sdr::ObjectUser { +private: diff --git a/libreoffice.spec b/libreoffice.spec index 975c9ab..1b01a93 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 5.0.1 +%define libo_version 5.0.2 # 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. @@ -52,7 +52,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +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 Group: Applications/Productivity @@ -331,8 +331,7 @@ Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch Patch23: 0001-implement-undo-for-equalize-marked-objects.patch Patch24: 0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch Patch25: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch -Patch26: 0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch -Patch27: 0001-implement-undo-of-delete-impress-cell-contents.patch +Patch26: 0001-implement-undo-of-delete-impress-cell-contents.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2447,6 +2446,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Sat Sep 05 2015 David Tardon - 1:5.0.2.1-1 +- update to 5.0.2 rc1 + * Sat Aug 22 2015 David Tardon - 1:5.0.1.2-1 - update to 5.0.1 rc2 diff --git a/sources b/sources index ad090bf..13160b9 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -a47ad3fbfc1b1b665598e1c133692a19 libreoffice-5.0.1.2.tar.xz -866e29eac8df9e106116e484e9068506 libreoffice-help-5.0.1.2.tar.xz -44378180db18158fb68fa39d555e079d libreoffice-translations-5.0.1.2.tar.xz +1c8e92d9d7cb30ba0ec68c780ef61178 libreoffice-5.0.2.1.tar.xz +34208f0803ece06bf1600076f7d8000d libreoffice-help-5.0.2.1.tar.xz +1842bb569fda247920e7a5c46e8a5a20 libreoffice-translations-5.0.2.1.tar.xz