[libreoffice/f20: 3/3] Merge branch 'master' into f20

[Caolán McNamara]

commit 8c3a79f4b782a9f4a1b04d5ed665d3a98f3f075a
Merge: beef0dc ab15888
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 25 10:50:45 2014 +0000

    Merge branch 'master' into f20
    
    Conflicts:
    	libreoffice.spec

 ...z-1065807-rework-i66157-for-multiple-writ.patch |  195 ++++++++++++++++++++
 0001-never-run-autogen.sh.patch                    |   25 +++
 libreoffice.spec                                   |    9 +-
 3 files changed, 228 insertions(+), 1 deletions(-)
---
diff --cc libreoffice.spec
index cfaa05c,e917939..b99d8d3
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@@ -2169,21 -2174,16 +2173,24 @@@ update-desktop-database %{_datadir}/app
  %endif
  
  %changelog
+ * Tue Feb 25 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.1.1-2
+ - Resolves: rhbz#1065807 search XDG defined "Templates" dir
+ 
 -* Thu Feb 13 2014 David Tardon <dtardon at redhat.com> - 1:4.2.1.1-1
 -- update to 4.2.1 rc1
 +* Thu Feb 20 2014 David Tardon <dtardon at redhat.com> - 1:4.2.1.1-1
 +- rhbz#1059953 rebase to 4.2.1
  
 -* Thu Feb 13 2014 David Tardon <dtardon at redhat.com> - 1:4.2.0.4-4
 -- rebuild for new ICU
 +* Tue Feb 18 2014 David Tardon <dtardon at redhat.com> - 1:4.1.5.3-2
 +- Resolves: rhbz#1065925 [abrt] libreoffice-core: Divide(): soffice.bin killed
 +  by SIGFPE
  
 -* Thu Feb 06 2014 David Tardon <dtardon at redhat.com> - 1:4.2.0.4-3
 +* Tue Feb 11 2014 David Tardon <dtardon at redhat.com> - 1:4.1.5.3-1
 +- new upstream release 4.1.5
 +
 +* Thu Jan 30 2014 David Tardon <dtardon at redhat.com> - 1:4.1.4.2-6
 +- split LibreLogo into a separate subpackage
 +- create a metapackage depending on all subpackages containing filters,
 +  for use of packages like unoconv
 +- Resolves: rhbz#1050162 don't draw to NULL window
  - Resolves: rhbz#1017379 libreoffice impress imports animated motion paths
    incorrectly from powerpoint
  - Resolves: fdo#33852 Custom animation (Motionpath Left) isn't being