[libreoffice] 4.1.2 rc1

David Tardon dtardon at fedoraproject.org
Thu Sep 5 07:53:44 UTC 2013


commit c747fd8bdb04827d07bb749859bb4cee20d9a2ae
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 5 09:47:32 2013 +0200

    4.1.2 rc1

 .gitignore                                         |    3 +
 ...-try-to-mount-in-gio-Content-getGFileInfo.patch |   78 -------------
 ...bz-993963-NULL-m_pWindow-on-firefox-delet.patch |   27 -----
 ...bz-998046-store-last-size-position-of-the.patch |   51 ---------
 ...y-use-the-SSPI-support-with-internal-neon.patch |   51 ---------
 ...bz-1000150-Do-not-call-exit-upon-XIOError.patch |  116 --------------------
 libreoffice.spec                                   |   23 ++---
 sources                                            |    6 +-
 8 files changed, 14 insertions(+), 341 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d678d3..157b36d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,6 @@
 /libreoffice-4.1.1.2.tar.xz
 /libreoffice-help-4.1.1.2.tar.xz
 /libreoffice-translations-4.1.1.2.tar.xz
+/libreoffice-4.1.2.1.tar.xz
+/libreoffice-help-4.1.2.1.tar.xz
+/libreoffice-translations-4.1.2.1.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index 5818f82..9a404e4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%define libo_version 4.1.1
+%define libo_version 4.1.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.
@@ -42,8 +42,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.2
-Release:        3%{?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/
@@ -254,12 +254,7 @@ Patch13: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
 Patch14: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
 Patch15: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
 Patch16: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch
-Patch17: 0001-only-use-the-SSPI-support-with-internal-neon.patch
-Patch18: 0001-Always-try-to-mount-in-gio-Content-getGFileInfo.patch
-Patch19: 0001-Resolves-rhbz-998046-store-last-size-position-of-the.patch
-Patch20: 0001-Make-charmap.cxx-compile-with-icu-4.4.patch
-Patch21: 0001-rhbz-1000150-Do-not-call-exit-upon-XIOError.patch
-Patch22: 0001-Resolves-rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
+Patch17: 0001-Make-charmap.cxx-compile-with-icu-4.4.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1008,12 +1003,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch14 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
 %patch15 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
 %patch16 -p1 -b .fdo-48835-application-menu-for-LibreOffice.patch
-%patch17 -p1 -b .only-use-the-SSPI-support-with-internal-neon.patch
-%patch18 -p1 -b .Always-try-to-mount-in-gio-Content-getGFileInfo.patch
-%patch19 -p1 -b .rhbz-998046-store-last-size-position-of-the.patch
-%patch20 -p1 -b .Make-charmap.cxx-compile-with-icu-4.4.patch
-%patch21 -p1 -b .rhbz-1000150-Do-not-call-exit-upon-XIOError.patch
-%patch22 -p1 -b .rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
+%patch17 -p1 -b .Make-charmap.cxx-compile-with-icu-4.4.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2108,6 +2098,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Sep 05 2013 David Tardon <dtardon at redhat.com> - 1:4.1.2.1-1
+- 4.1.2 rc1
+
 * Tue Sep 03 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.1.2-3
 - Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window
 
diff --git a/sources b/sources
index fcd5037..4eb3bc4 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
-4eb8fd2b0d1177d19b2f797faabc4ea2  libreoffice-4.1.1.2.tar.xz
-f6b418a1ed94ef9d5ee30e9f5d7f305a  libreoffice-help-4.1.1.2.tar.xz
-e8c69bdb55586531cc192904467f5e24  libreoffice-translations-4.1.1.2.tar.xz
+92041644ce343ca568fd28f459a0b3f4  libreoffice-4.1.2.1.tar.xz
+05894783116bd18562bcebaf73d7522d  libreoffice-help-4.1.2.1.tar.xz
+3ae0cb4b561e10324d41b6163ac9b5de  libreoffice-translations-4.1.2.1.tar.xz


More information about the scm-commits mailing list