[libreoffice/f20: 25/25] merge origin/master

[David Tardon]

commit 641f69c72ae6c8fe47004d6a291ab967b5557a72
Merge: c34415d 76aab81
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 5 10:25:04 2014 +0200

    merge origin/master

 .gitignore                                         |   14 +-
 ...-36815-center-scaled-comment-page-vertica.patch |  104 +++++
 ...z-1076264-intermittent-a11y-crash-in-calc.patch |  203 ---------
 ...o-37130-use-10pt-Default-style-font-for-c.patch |   32 ++
 ...o-78128-go-back-to-using-an-interim-metaf.patch |  119 ++++++
 ...bz-1065807-use-xdg-Templates-for-default-.patch |   12 +-
 ...olves-rhbz-1077780-crash-on-loading-.docx.patch |   26 --
 0001-add-X-TryExec-entries-to-desktop-files.patch  |   90 ++++
 0001-add-a-format-all-comments-feature.patch       |  441 ++++++++++++++++++++
 ...list-common-lang-independant-template-dir.patch |   25 --
 ...-Qt-from-interfering-with-the-session-man.patch |   12 +-
 ...6-Delete-the-destination-first-then-paste.patch |  170 --------
 libreoffice.spec                                   |  149 +++----
 sources                                            |    6 +-
 14 files changed, 868 insertions(+), 535 deletions(-)
---
diff --cc libreoffice.spec
index 086bba5,04c9428..8f0ff6d
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@@ -17,11 -17,10 +17,9 @@@
  %endif
  # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
  %define __jar_repack %{nil}
- # don't worry about whitespace for now
- %define _default_patch_flags -s -l
  # make it easier to download sources from pre-release site
  # http://dev-builds.libreoffice.org/pre-releases/src
 -%define source_url http://dev-builds.libreoffice.org/pre-releases/src
 -# %%define source_url http://download.documentfoundation.org/libreoffice/src/%{libo_version}
 +%define source_url http://download.documentfoundation.org/libreoffice/src/%{libo_version}
  # URL for external projects' tarballs
  %define external_url http://dev-www.libreoffice.org/src/
  
@@@ -2297,19 -2259,37 +2258,25 @@@ update-desktop-database %{_datadir}/app
  %endif
  
  %changelog
+ * Thu May 01 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.2-2
+ - better scaling of notes-using pages
+ 
+ * Wed Apr 30 2014 David Tardon <dtardon at redhat.com> - 1:4.2.4.2-1
+ - update to 4.2.4 rc2
+ 
 -* Fri Apr 25 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-7
 -- Related: rhbz#1032774 disable autoexit when switching monitors
 +* Fri Apr 25 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.3.3-9
 +- Related: rhbz#1032774 disable slide auto-exit when swithing monitors
  
 -* Thu Apr 24 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-6
 -- Resolves: fdo#37130 use 10pt Default style font for comments
 -- Resolves: fdo#60040 crash after undoing master page
 -- vertically center printout when including comments
 +* Thu Apr 24 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.3.3-8
 +- Resolves: fdo#75622 presentations with table slow to load
 +- Resolves: fdo#60040 rhbz#1090956 crash after undoing master page
  
 -* Wed Apr 23 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-5
 -- add a 'format all comments' feature
 -
 -* Tue Apr 22 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-4
 +* Tue Apr 22 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.3.3-7
 +- Resolves: rhbz#1089340 crash on search+replace + close + searchreplace
 +  in calc
 +- Resolves: rhbz#1088625 crash in presentation console
  - Resolves: rhbz#1089377 crash on loading a specific rtf
  
 -* Tue Apr 22 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-3
 -- sometimes tables in impress don't resize when adding rows
 -- Resolves: fdo#71423 crash while editing Impress tables
 -
 -* Fri Apr 18 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.1-2
 -- every 2nd print job is incorrectly flagged as failed
 -- Related: rhbz#1088625 PresenterPaintManager seen as NULL
 -
 -* Thu Apr 17 2014 David Tardon <dtardon at redhat.com> - 1:4.2.4.1-1
 -- update to 4.2.4 rc1
 -
  * Wed Apr 16 2014 David Tardon <dtardon at redhat.com> - 1:4.2.3.3-6
  - install man pages
  - Resolves: rhbz#1086714 overlarge pixmap