diff --git a/0001-Remove-sub-classing-from-OO.o-mime-types.patch b/0001-Remove-sub-classing-from-OO.o-mime-types.patch new file mode 100644 index 0000000..d73e07b --- /dev/null +++ b/0001-Remove-sub-classing-from-OO.o-mime-types.patch @@ -0,0 +1,265 @@ +From b78ba0148a6d53248d72778b088ba8c8780ff79e Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 25 Aug 2011 10:54:47 +0100 +Subject: [PATCH] Remove sub-classing from OO.o mime-types + +https://bugs.freedesktop.org/show_bug.cgi?id=40354 +--- + freedesktop.org.xml.in | 31 ------------------------------- + 1 files changed, 0 insertions(+), 31 deletions(-) + +diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in +index e08ce53..5794e99 100644 +--- a/freedesktop.org.xml.in ++++ b/freedesktop.org.xml.in +@@ -714,7 +714,6 @@ command to generate the output files. + + + <_comment>OpenOffice Calc spreadsheet +- + + + +@@ -727,7 +726,6 @@ command to generate the output files. + + + <_comment>OpenOffice Calc template +- + + + +@@ -740,7 +738,6 @@ command to generate the output files. + + + <_comment>OpenOffice Draw drawing +- + + + +@@ -753,7 +750,6 @@ command to generate the output files. + + + <_comment>OpenOffice Draw template +- + + + +@@ -766,7 +762,6 @@ command to generate the output files. + + + <_comment>OpenOffice Impress presentation +- + + + +@@ -779,7 +774,6 @@ command to generate the output files. + + + <_comment>OpenOffice Impress template +- + + + +@@ -792,7 +786,6 @@ command to generate the output files. + + + <_comment>OpenOffice Math formula +- + + + +@@ -805,7 +798,6 @@ command to generate the output files. + + + <_comment>OpenOffice Writer document +- + + + +@@ -818,7 +810,6 @@ command to generate the output files. + + + <_comment>OpenOffice Writer global document +- + + + +@@ -831,7 +822,6 @@ command to generate the output files. + + + <_comment>OpenOffice Writer template +- + + + +@@ -846,7 +836,6 @@ command to generate the output files. + <_comment>ODT document + ODT + OpenDocument Text +- + + + +@@ -861,7 +850,6 @@ command to generate the output files. + <_comment>ODT document (Flat XML) + FODT + OpenDocument Text (Flat XML) +- + + + +@@ -869,7 +857,6 @@ command to generate the output files. + <_comment>ODT template + ODT + OpenDocument Text +- + + + +@@ -884,7 +871,6 @@ command to generate the output files. + <_comment>OTH template + OTH + OpenDocument HTML +- + + + +@@ -899,7 +885,6 @@ command to generate the output files. + <_comment>ODM document + ODM + OpenDocument Master +- + + + +@@ -914,7 +899,6 @@ command to generate the output files. + <_comment>ODG drawing + ODG + OpenDocument Drawing +- + + + +@@ -929,7 +913,6 @@ command to generate the output files. + <_comment>ODG drawing (Flat XML) + FODG + OpenDocument Drawing (Flat XML) +- + + + +@@ -937,7 +920,6 @@ command to generate the output files. + <_comment>ODG template + ODG + OpenDocument Drawing +- + + + +@@ -952,7 +934,6 @@ command to generate the output files. + <_comment>ODP presentation + ODP + OpenDocument Presentation +- + + + +@@ -967,7 +948,6 @@ command to generate the output files. + <_comment>ODP presentation (Flat XML) + FODP + OpenDocument Presentation (Flat XML) +- + + + +@@ -975,7 +955,6 @@ command to generate the output files. + <_comment>ODP template + ODP + OpenDocument Presentation +- + + + +@@ -990,7 +969,6 @@ command to generate the output files. + <_comment>ODS spreadsheet + ODS + OpenDocument Spreadsheet +- + + + +@@ -1005,7 +983,6 @@ command to generate the output files. + <_comment>ODS spreadsheet (Flat XML) + FODS + OpenDocument Spreadsheet (Flat XML) +- + + + +@@ -1013,7 +990,6 @@ command to generate the output files. + <_comment>ODS template + ODS + OpenDocument Spreadsheet +- + + + +@@ -1028,7 +1004,6 @@ command to generate the output files. + <_comment>ODC chart + ODC + OpenDocument Chart +- + + + +@@ -1043,7 +1018,6 @@ command to generate the output files. + <_comment>ODC template + ODC + OpenDocument Chart +- + + + +@@ -1058,7 +1032,6 @@ command to generate the output files. + <_comment>ODF formula + ODF + OpenDocument Formula +- + + + +@@ -1073,7 +1046,6 @@ command to generate the output files. + <_comment>ODF template + ODF + OpenDocument Formula +- + + + +@@ -1088,7 +1060,6 @@ command to generate the output files. + <_comment>ODB database + ODB + OpenDocument Database +- + + + +@@ -1096,7 +1067,6 @@ command to generate the output files. + <_comment>ODI image + ODI + OpenDocument Image +- + + + +@@ -1109,7 +1079,6 @@ command to generate the output files. + + + <_comment>OpenOffice.org extension +- + + + +-- +1.7.6 + diff --git a/shared-mime-info.spec b/shared-mime-info.spec index 511655a..d60bcdd 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 0.90 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://freedesktop.org/Software/shared-mime-info @@ -14,6 +14,9 @@ Source2: totem-defaults.list # for i in `grep MimeType= /usr/share/applications/gnome-file-roller.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do if ! `grep -q $i defaults.list` ; then echo $i=gnome-file-roller.desktop\; >> file-roller-defaults.list ; fi ; done Source3: file-roller-defaults.list +# Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354 +Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: glib2-devel @@ -34,6 +37,7 @@ and looking up the correct MIME type in a database. %prep %setup -q +%patch0 -p1 -b .ooo-zip %build @@ -72,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Thu Aug 25 2011 Bastien Nocera 0.90-9 +- Never try to load OO.o files in file-roller + * Thu May 26 2011 Bastien Nocera 0.90-8 - Fix LibreOffice associations (patch from Caolan McNamara, #707971)