[shared-mime-info/f16] Never try to load OO.o files in file-roller
Bastien Nocera
hadess at fedoraproject.org
Thu Aug 25 14:10:46 UTC 2011
commit 3708b41184b1bfc1657286708fe1f7c9af86e38f
Author: Bastien Nocera <hadess at hadess.net>
Date: Thu Aug 25 15:10:32 2011 +0100
Never try to load OO.o files in file-roller
...-Remove-sub-classing-from-OO.o-mime-types.patch | 265 ++++++++++++++++++++
shared-mime-info.spec | 9 +-
2 files changed, 273 insertions(+), 1 deletions(-)
---
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 <hadess at hadess.net>
+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.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.calc">
+ <_comment>OpenOffice Calc spreadsheet</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -727,7 +726,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.calc.template">
+ <_comment>OpenOffice Calc template</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -740,7 +738,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.draw">
+ <_comment>OpenOffice Draw drawing</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="image-x-generic"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -753,7 +750,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.draw.template">
+ <_comment>OpenOffice Draw template</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="image-x-generic"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -766,7 +762,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.impress">
+ <_comment>OpenOffice Impress presentation</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-presentation"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -779,7 +774,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.impress.template">
+ <_comment>OpenOffice Impress template</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-presentation"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -792,7 +786,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.math">
+ <_comment>OpenOffice Math formula</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -805,7 +798,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.writer">
+ <_comment>OpenOffice Writer document</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -818,7 +810,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.writer.global">
+ <_comment>OpenOffice Writer global document</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -831,7 +822,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.sun.xml.writer.template">
+ <_comment>OpenOffice Writer template</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic>
+ <match type="string" value="PK\003\004" offset="0">
+@@ -846,7 +836,6 @@ command to generate the output files.
+ <_comment>ODT document</_comment>
+ <acronym>ODT</acronym>
+ <expanded-acronym>OpenDocument Text</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -861,7 +850,6 @@ command to generate the output files.
+ <_comment>ODT document (Flat XML)</_comment>
+ <acronym>FODT</acronym>
+ <expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
+- <sub-class-of type="application/xml"/>
+ <generic-icon name="x-office-document"/>
+ <glob pattern="*.fodt"/>
+ </mime-type>
+@@ -869,7 +857,6 @@ command to generate the output files.
+ <_comment>ODT template</_comment>
+ <acronym>ODT</acronym>
+ <expanded-acronym>OpenDocument Text</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -884,7 +871,6 @@ command to generate the output files.
+ <_comment>OTH template</_comment>
+ <acronym>OTH</acronym>
+ <expanded-acronym>OpenDocument HTML</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="text-html"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -899,7 +885,6 @@ command to generate the output files.
+ <_comment>ODM document</_comment>
+ <acronym>ODM</acronym>
+ <expanded-acronym>OpenDocument Master</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -914,7 +899,6 @@ command to generate the output files.
+ <_comment>ODG drawing</_comment>
+ <acronym>ODG</acronym>
+ <expanded-acronym>OpenDocument Drawing</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="image-x-generic"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -929,7 +913,6 @@ command to generate the output files.
+ <_comment>ODG drawing (Flat XML)</_comment>
+ <acronym>FODG</acronym>
+ <expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
+- <sub-class-of type="application/xml"/>
+ <generic-icon name="image-x-generic"/>
+ <glob pattern="*.fodg"/>
+ </mime-type>
+@@ -937,7 +920,6 @@ command to generate the output files.
+ <_comment>ODG template</_comment>
+ <acronym>ODG</acronym>
+ <expanded-acronym>OpenDocument Drawing</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="image-x-generic"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -952,7 +934,6 @@ command to generate the output files.
+ <_comment>ODP presentation</_comment>
+ <acronym>ODP</acronym>
+ <expanded-acronym>OpenDocument Presentation</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-presentation"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -967,7 +948,6 @@ command to generate the output files.
+ <_comment>ODP presentation (Flat XML)</_comment>
+ <acronym>FODP</acronym>
+ <expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
+- <sub-class-of type="application/xml"/>
+ <generic-icon name="x-office-presentation"/>
+ <glob pattern="*.fodp"/>
+ </mime-type>
+@@ -975,7 +955,6 @@ command to generate the output files.
+ <_comment>ODP template</_comment>
+ <acronym>ODP</acronym>
+ <expanded-acronym>OpenDocument Presentation</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-presentation"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -990,7 +969,6 @@ command to generate the output files.
+ <_comment>ODS spreadsheet</_comment>
+ <acronym>ODS</acronym>
+ <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1005,7 +983,6 @@ command to generate the output files.
+ <_comment>ODS spreadsheet (Flat XML)</_comment>
+ <acronym>FODS</acronym>
+ <expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
+- <sub-class-of type="application/xml"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <glob pattern="*.fods"/>
+ </mime-type>
+@@ -1013,7 +990,6 @@ command to generate the output files.
+ <_comment>ODS template</_comment>
+ <acronym>ODS</acronym>
+ <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1028,7 +1004,6 @@ command to generate the output files.
+ <_comment>ODC chart</_comment>
+ <acronym>ODC</acronym>
+ <expanded-acronym>OpenDocument Chart</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1043,7 +1018,6 @@ command to generate the output files.
+ <_comment>ODC template</_comment>
+ <acronym>ODC</acronym>
+ <expanded-acronym>OpenDocument Chart</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-spreadsheet"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1058,7 +1032,6 @@ command to generate the output files.
+ <_comment>ODF formula</_comment>
+ <acronym>ODF</acronym>
+ <expanded-acronym>OpenDocument Formula</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1073,7 +1046,6 @@ command to generate the output files.
+ <_comment>ODF template</_comment>
+ <acronym>ODF</acronym>
+ <expanded-acronym>OpenDocument Formula</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1088,7 +1060,6 @@ command to generate the output files.
+ <_comment>ODB database</_comment>
+ <acronym>ODB</acronym>
+ <expanded-acronym>OpenDocument Database</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <glob pattern="*.odb"/>
+ </mime-type>
+@@ -1096,7 +1067,6 @@ command to generate the output files.
+ <_comment>ODI image</_comment>
+ <acronym>ODI</acronym>
+ <expanded-acronym>OpenDocument Image</expanded-acronym>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="image-x-generic"/>
+ <magic priority="50">
+ <match type="string" value="PK\003\004" offset="0">
+@@ -1109,7 +1079,6 @@ command to generate the output files.
+ </mime-type>
+ <mime-type type="application/vnd.openofficeorg.extension">
+ <_comment>OpenOffice.org extension</_comment>
+- <sub-class-of type="application/zip"/>
+ <generic-icon name="x-office-document"/>
+ <glob pattern="*.oxt" />
+ </mime-type>
+--
+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 <bnocera at redhat.com> 0.90-9
+- Never try to load OO.o files in file-roller
+
* Thu May 26 2011 Bastien Nocera <bnocera at redhat.com> 0.90-8
- Fix LibreOffice associations (patch from Caolan McNamara, #707971)
More information about the scm-commits
mailing list