[libreoffice] 4.1.0 rc1
David Tardon
dtardon at fedoraproject.org
Wed Jun 19 05:25:22 UTC 2013
commit 7f2ba7970a5b37a83cef0bbb9756e7fbde41b3fa
Author: David Tardon <dtardon at redhat.com>
Date: Wed Jun 19 07:22:37 2013 +0200
4.1.0 rc1
.gitignore | 3 +
0001-fdo-65132-compute-font-height-correctly.patch | 29 -------------
0001-simplify-check-for-harfbuzz.patch | 45 --------------------
...rt-Fix-fdo-64972-strikethrough-displays-t.patch | 39 -----------------
libreoffice.spec | 15 +++----
sources | 3 +
6 files changed, 12 insertions(+), 122 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae60725..708ea48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@
/libreoffice-4.1.0.0.beta2.tar.xz
/libreoffice-help-4.1.0.0.beta2.tar.xz
/libreoffice-translations-4.1.0.0.beta2.tar.xz
+/libreoffice-4.1.0.1.tar.xz
+/libreoffice-help-4.1.0.1.tar.xz
+/libreoffice-translations-4.1.0.1.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index 53ea7b2..6d9361c 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}
# rhbz#715152 state vendor
%if 0%{?rhel}
%define vendoroption --with-vendor="Red Hat, Inc."
@@ -42,8 +42,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: %{libo_version}.0
-Release: 9%{?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
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@@ -249,9 +249,6 @@ Patch16: 0001-do-not-build-LibreOffice_Test.patch
Patch17: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
Patch18: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
Patch19: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
-Patch20: 0001-simplify-check-for-harfbuzz.patch
-Patch21: 0001-fdo-65132-compute-font-height-correctly.patch
-Patch22: 0002-Revert-Revert-Fix-fdo-64972-strikethrough-displays-t.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -990,9 +987,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch17 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch
%patch18 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
%patch19 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
-%patch20 -p1 -b .simplify-check-for-harfbuzz.patch
-%patch21 -p1 -b .fdo-65132-compute-font-height-correctly.patch
-%patch22 -p1 -b .Revert-Revert-Fix-fdo-64972-strikethrough-displays-t.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@@ -2062,6 +2056,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Wed Jun 19 2013 David Tardon <dtardon at redhat.com> - 1:4.1.0.1-1
+- 4.1.0 rc1
+
* Sun Jun 16 2013 David Tardon <dtardon at redhat.com> - 1:4.1.0.0-9.beta2
- Resolves: rhbz#971321 failing tests on ppc and s390
- Resolves: rhbz#974062 incorrect rendering of text in outline blocks in
diff --git a/sources b/sources
index dae34a1..a654a06 100644
--- a/sources
+++ b/sources
@@ -9,3 +9,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
a785e1ed4809246edc39d0b55a807cdd libreoffice-4.1.0.0.beta2.tar.xz
96ea39853d9058cb9e98749539827187 libreoffice-help-4.1.0.0.beta2.tar.xz
6ecbe09a87d5c2c1a186671d24643111 libreoffice-translations-4.1.0.0.beta2.tar.xz
+223fccc626e15fd54d196333db1f7704 libreoffice-4.1.0.1.tar.xz
+932d9f89fc5f1766c15fcbb9d852c329 libreoffice-help-4.1.0.1.tar.xz
+c1063f6e3bd0860cd23ded67f4b04e64 libreoffice-translations-4.1.0.1.tar.xz
More information about the scm-commits
mailing list