[libreoffice] update to 4.2.1 rc1

David Tardon dtardon at fedoraproject.org
Thu Feb 13 16:36:42 UTC 2014


commit 60a544bd3cbf15895b70f722ad981fcc1507fb35
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 13 17:22:31 2014 +0100

    update to 4.2.1 rc1

 .gitignore                                         |    3 +
 ...z-1047871-conditional-formatting-doesn-t-.patch |   87 -------------------
 ...32-to-satisfy-oox-helper-helper.hxx-s-con.patch |   88 --------------------
 ...3852-do-not-remove-too-much-from-the-path.patch |   29 -------
 ...7379-do-not-remove-too-much-from-the-path.patch |   29 -------
 libreoffice.spec                                   |   11 ++-
 sources                                            |    6 +-
 7 files changed, 12 insertions(+), 241 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a28107..4e80dbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,6 @@
 /libreoffice-4.2.0.4.tar.xz
 /libreoffice-help-4.2.0.4.tar.xz
 /libreoffice-translations-4.2.0.4.tar.xz
+/libreoffice-4.2.1.1.tar.xz
+/libreoffice-help-4.2.1.1.tar.xz
+/libreoffice-translations-4.2.1.1.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index 5de95b9..1dd5b98 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%define libo_version 4.2.0
+%define libo_version 4.2.1
 # 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.
@@ -42,8 +42,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.4
-Release:        4%{?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.libreoffice.org/default/
@@ -277,8 +277,6 @@ Patch14: 0001-Resolves-rhbz-1038189-refresh-printer-list-when-prin.patch
 Patch15: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch
 Patch16: 0001-Use-sal_Int32-to-satisfy-oox-helper-helper.hxx-s-con.patch
 Patch17: 0001-disable-firebird-unit-test.patch
-Patch18: 0001-rhbz-1017379-do-not-remove-too-much-from-the-path.patch
-Patch19: 0001-fdo-33852-do-not-remove-too-much-from-the-path.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2174,6 +2172,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Feb 13 2014 David Tardon <dtardon at redhat.com> - 1:4.2.1.1-1
+- update to 4.2.1 rc1
+
 * Thu Feb 13 2014 David Tardon <dtardon at redhat.com> - 1:4.2.0.4-4
 - rebuild for new ICU
 
diff --git a/sources b/sources
index c0a5688..0dd1888 100644
--- a/sources
+++ b/sources
@@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
 1f24ab1d39f4a51faf22244c94a6203f  1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 0168229624cfac409e766913506961a8  0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 12fb8b5b0d5132726e57b9b9fc7e22c4  libreoffice-multiliblauncher.sh
-98674d57d6dd24baef38f007b5020e8e  libreoffice-4.2.0.4.tar.xz
-8554bbbdfc72db998a191c71eeafdb55  libreoffice-help-4.2.0.4.tar.xz
-4873b18cd8a535814777c8630fe2db9f  libreoffice-translations-4.2.0.4.tar.xz
+76d9612950ae1de8818943b681ba71c3  libreoffice-4.2.1.1.tar.xz
+fda77ccb5be32ab54304082fe8d15841  libreoffice-help-4.2.1.1.tar.xz
+cf7873e5e1ffc8b63d42bad5b2f37a2b  libreoffice-translations-4.2.1.1.tar.xz


More information about the scm-commits mailing list