[libreoffice/f20] Related: rhbz#1047017 actually apply the patch

David Tardon dtardon at fedoraproject.org
Thu Jan 23 12:34:25 UTC 2014


commit f4833594022033f9221941831dae884d66c6b576
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jan 23 13:26:05 2014 +0100

    Related: rhbz#1047017 actually apply the patch

 libreoffice.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index f33cf14..181e819 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -42,7 +42,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?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/
@@ -267,6 +267,7 @@ Patch27: 0001-make-dragging-and-dropping-slides-stop-crashing.patch
 Patch28: 0001-Related-rhbz-1039517-ml-short-cut-keys-are-unavailab.patch
 Patch29: 0001-n-839727-Crash-fix.patch
 Patch30: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch
+Patch31: 0001-fdo-66864-Return-from-full-screen-should-restore-too.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1033,6 +1034,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch28 -p1 -b .rhbz-1039517-ml-short-cut-keys-are-unavailab.patch
 %patch29 -p1 -b .n839727-Crash-fix.patch
 %patch30 -p1 -b .rhbz-1047871-conditional-formatting-doesn-t-.patch
+%patch31 -p1 -b .fdo-66864-Return-from-full-screen-should-restore-too.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2122,6 +2124,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Jan 23 2014 David Tardon <dtardon at redhat.com> - 1:4.1.4.2-5
+- Related: rhbz#1047017 actually apply the patch
+
 * Mon Jan 13 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.1.4.2-4
 - Resolves: rhbz#1038176 fix crash in loading certain charts
 - Related: rhbz#1047871 conditional formatting doesn't fix on screen


More information about the scm-commits mailing list