update to 5.0.2 rc1

f41
David Tardon 9 years ago
parent 93743e6f7c
commit 3a4a43aa38

3
.gitignore vendored

@ -60,3 +60,6 @@
/libreoffice-5.0.1.2.tar.xz /libreoffice-5.0.1.2.tar.xz
/libreoffice-help-5.0.1.2.tar.xz /libreoffice-help-5.0.1.2.tar.xz
/libreoffice-translations-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

@ -16,7 +16,7 @@ index cba0a75..aee9dd7 100644
--- a/include/svx/svdmark.hxx --- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx
@@ -42,7 +42,10 @@ typedef std::set<sal_uInt16> SdrUShortCont; @@ -42,7 +42,10 @@ typedef std::set<sal_uInt16> SdrUShortCont;
*/ // Everything a View needs to know about a selected object
class SVX_DLLPUBLIC SdrMark : public sdr::ObjectUser class SVX_DLLPUBLIC SdrMark : public sdr::ObjectUser
{ {
+private: +private:

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit # 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 # Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names, # 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. # so we need a way to define it easily at one place.
@ -52,7 +52,7 @@
Summary: Free Software Productivity Suite Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.2 Version: %{libo_version}.1
Release: 1%{?libo_prerelease}%{?dist} 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 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 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 Patch23: 0001-implement-undo-for-equalize-marked-objects.patch
Patch24: 0001-time-stamp-object-selections-and-use-newest-as-ref-f.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 Patch25: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch
Patch26: 0001-Related-rhbz-1255200-apparent-missing-stylesheet.patch Patch26: 0001-implement-undo-of-delete-impress-cell-contents.patch
Patch27: 0001-implement-undo-of-delete-impress-cell-contents.patch
%define instdir %{_libdir} %define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice %define baseinstdir %{instdir}/libreoffice
@ -2447,6 +2446,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Sat Sep 05 2015 David Tardon <dtardon@redhat.com> - 1:5.0.2.1-1
- update to 5.0.2 rc1
* Sat Aug 22 2015 David Tardon <dtardon@redhat.com> - 1:5.0.1.2-1 * Sat Aug 22 2015 David Tardon <dtardon@redhat.com> - 1:5.0.1.2-1
- update to 5.0.1 rc2 - update to 5.0.1 rc2

@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
a47ad3fbfc1b1b665598e1c133692a19 libreoffice-5.0.1.2.tar.xz 1c8e92d9d7cb30ba0ec68c780ef61178 libreoffice-5.0.2.1.tar.xz
866e29eac8df9e106116e484e9068506 libreoffice-help-5.0.1.2.tar.xz 34208f0803ece06bf1600076f7d8000d libreoffice-help-5.0.2.1.tar.xz
44378180db18158fb68fa39d555e079d libreoffice-translations-5.0.1.2.tar.xz 1842bb569fda247920e7a5c46e8a5a20 libreoffice-translations-5.0.2.1.tar.xz

Loading…
Cancel
Save