Resolves: rhbz#1327847 remove multilib conflicts in .desktop files

0001-rhbz-1327847-emit-.desktop-trans.-in-predictable-ord.patch

@@ -0,0 +1,26 @@
+From 03701c986cd1082c5cd9aea7b479811c7a079bca Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 16 May 2016 14:52:47 +0200
+Subject: [PATCH] rhbz#1327847 emit .desktop trans. in predictable order
+
+Change-Id: Ib07e27a9df6a08868ea505e141e2526435d2a0ef
+---
+ solenv/bin/desktop-translate.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/solenv/bin/desktop-translate.pl b/solenv/bin/desktop-translate.pl
+index 0680431..259e7da 100644
+--- a/solenv/bin/desktop-translate.pl
++++ b/solenv/bin/desktop-translate.pl
+@@ -144,7 +144,7 @@ foreach $template (keys %templates) {
+         print OUTFILE $keyline;
+         if (/$key/) {
+             my $translations = $templates{$template}->{'translations'};
+-            foreach my $locale (keys %{$translations}) {
++            foreach my $locale (sort (keys %{$translations})) {
+                 my $value = $translations->{$locale};
+                 # print "locale is $locale\n";
+                 # print "value is $value\n";
+-- 
+2.7.4
+

libreoffice.spec

@@ -55,7 +55,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.0
-Release:        5%{?libo_prerelease}%{?dist}
+Release:        6%{?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 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -239,6 +239,7 @@ Patch9: 0001-tdf-99353-take-the-footgun-away-from-FilterCache.patch
 Patch10: 0001-only-set-cur.-page-once-when-removing-mult.-pages.patch
 Patch11: 0001-improve-perf.-of-VCL-event-dispatch-take-II.patch
 Patch12: 0001-Resolves-tdf-99730-lower-the-barrier-for-inferior-sy.patch
+Patch13: 0001-rhbz-1327847-emit-.desktop-trans.-in-predictable-ord.patch
 
 %if ! 0%{?rhel}
 Patch400: 0001-Update-mdds-to-1.2.0.-Note-that-the-API-version-is-a.patch
@@ -2243,6 +2244,9 @@ done
 %endif
 
 %changelog
+* Mon May 16 2016 David Tardon <dtardon@redhat.com> - 1:5.2.0.0-6.alpha1-UNBUILT
+- Resolves: rhbz#1327847 remove multilib conflicts in .desktop files
+
 * Fri May 13 2016 David Tardon <dtardon@redhat.com> - 1:5.2.0.0-5.alpha1
 - rebuild for mdds 1.2.0
 - Resolves: rhbz#1325858 fix build on 64-bit secondary arches