rpms/shared-mime-info
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix patch application in rawhide

Browse Source
This commit is contained in:
Bastien Nocera 2016-06-04 19:51:00 +02:00
parent a701c61cd2
commit 700d8a4aab
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
0001-Remove-sub-classing-from-OO.o-mime-types.patch
View File

@ -1,4 +1,4 @@
From 4b67339a19d907dbd44dd7fef1ea50761a5ce943 Mon Sep 17 00:00:00 2001
From 891adc1a347de5c30fe8a88e904c25120e9de45a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 25 Aug 2011 10:54:47 +0100
Subject: [PATCH] Remove sub-classing from OO.o mime-types
@ -9,10 +9,10 @@ https://bugs.freedesktop.org/show_bug.cgi?id=40354
1 file changed, 31 deletions(-)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 46dbfbd..bd3945d 100644
index 02cf266..6d9f907 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -774,7 +774,6 @@ command to generate the output files.
@@ -821,7 +821,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc">
<_comment>OpenOffice Calc spreadsheet</_comment>
@ -20,7 +20,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -787,7 +786,6 @@ command to generate the output files.
@@ -834,7 +833,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc.template">
<_comment>OpenOffice Calc template</_comment>
@ -28,7 +28,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -800,7 +798,6 @@ command to generate the output files.
@@ -847,7 +845,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw">
<_comment>OpenOffice Draw drawing</_comment>
@ -36,7 +36,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="image-x-generic"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -813,7 +810,6 @@ command to generate the output files.
@@ -860,7 +857,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw.template">
<_comment>OpenOffice Draw template</_comment>
@ -44,7 +44,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="image-x-generic"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -826,7 +822,6 @@ command to generate the output files.
@@ -873,7 +869,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress">
<_comment>OpenOffice Impress presentation</_comment>
@ -52,7 +52,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-presentation"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -839,7 +834,6 @@ command to generate the output files.
@@ -886,7 +881,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress.template">
<_comment>OpenOffice Impress template</_comment>
@ -60,7 +60,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-presentation"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -852,7 +846,6 @@ command to generate the output files.
@@ -899,7 +893,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.math">
<_comment>OpenOffice Math formula</_comment>
@ -68,7 +68,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -865,7 +858,6 @@ command to generate the output files.
@@ -912,7 +905,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer">
<_comment>OpenOffice Writer document</_comment>
@ -76,7 +76,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -878,7 +870,6 @@ command to generate the output files.
@@ -925,7 +917,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.global">
<_comment>OpenOffice Writer global document</_comment>
@ -84,7 +84,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -891,7 +882,6 @@ command to generate the output files.
@@ -938,7 +929,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.template">
<_comment>OpenOffice Writer template</_comment>
@ -92,7 +92,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic>
<match type="string" value="PK\003\004" offset="0">
@@ -906,7 +896,6 @@ command to generate the output files.
@@ -953,7 +943,6 @@ command to generate the output files.
<_comment>ODT document</_comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@ -100,7 +100,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -921,7 +910,6 @@ command to generate the output files.
@@ -968,7 +957,6 @@ command to generate the output files.
<_comment>ODT document (Flat XML)</_comment>
<acronym>FODT</acronym>
<expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
@ -108,7 +108,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<glob pattern="*.fodt"/>
</mime-type>
@@ -929,7 +917,6 @@ command to generate the output files.
@@ -976,7 +964,6 @@ command to generate the output files.
<_comment>ODT template</_comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@ -116,7 +116,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -944,7 +931,6 @@ command to generate the output files.
@@ -991,7 +978,6 @@ command to generate the output files.
<_comment>OTH template</_comment>
<acronym>OTH</acronym>
<expanded-acronym>OpenDocument HTML</expanded-acronym>
@ -124,7 +124,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="text-html"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -959,7 +945,6 @@ command to generate the output files.
@@ -1006,7 +992,6 @@ command to generate the output files.
<_comment>ODM document</_comment>
<acronym>ODM</acronym>
<expanded-acronym>OpenDocument Master</expanded-acronym>
@ -132,7 +132,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -974,7 +959,6 @@ command to generate the output files.
@@ -1021,7 +1006,6 @@ command to generate the output files.
<_comment>ODG drawing</_comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@ -140,7 +140,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="image-x-generic"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -989,7 +973,6 @@ command to generate the output files.
@@ -1036,7 +1020,6 @@ command to generate the output files.
<_comment>ODG drawing (Flat XML)</_comment>
<acronym>FODG</acronym>
<expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
@ -148,7 +148,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="image-x-generic"/>
<glob pattern="*.fodg"/>
</mime-type>
@@ -997,7 +980,6 @@ command to generate the output files.
@@ -1044,7 +1027,6 @@ command to generate the output files.
<_comment>ODG template</_comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@ -156,7 +156,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="image-x-generic"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1012,7 +994,6 @@ command to generate the output files.
@@ -1059,7 +1041,6 @@ command to generate the output files.
<_comment>ODP presentation</_comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@ -164,7 +164,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-presentation"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1027,7 +1008,6 @@ command to generate the output files.
@@ -1074,7 +1055,6 @@ command to generate the output files.
<_comment>ODP presentation (Flat XML)</_comment>
<acronym>FODP</acronym>
<expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
@ -172,7 +172,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-presentation"/>
<glob pattern="*.fodp"/>
</mime-type>
@@ -1035,7 +1015,6 @@ command to generate the output files.
@@ -1082,7 +1062,6 @@ command to generate the output files.
<_comment>ODP template</_comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@ -180,7 +180,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-presentation"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1050,7 +1029,6 @@ command to generate the output files.
@@ -1097,7 +1076,6 @@ command to generate the output files.
<_comment>ODS spreadsheet</_comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@ -188,7 +188,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1065,7 +1043,6 @@ command to generate the output files.
@@ -1112,7 +1090,6 @@ command to generate the output files.
<_comment>ODS spreadsheet (Flat XML)</_comment>
<acronym>FODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
@ -196,7 +196,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.fods"/>
</mime-type>
@@ -1073,7 +1050,6 @@ command to generate the output files.
@@ -1120,7 +1097,6 @@ command to generate the output files.
<_comment>ODS template</_comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@ -204,7 +204,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1088,7 +1064,6 @@ command to generate the output files.
@@ -1135,7 +1111,6 @@ command to generate the output files.
<_comment>ODC chart</_comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@ -212,7 +212,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1103,7 +1078,6 @@ command to generate the output files.
@@ -1150,7 +1125,6 @@ command to generate the output files.
<_comment>ODC template</_comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@ -220,7 +220,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1118,7 +1092,6 @@ command to generate the output files.
@@ -1165,7 +1139,6 @@ command to generate the output files.
<_comment>ODF formula</_comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@ -228,7 +228,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1133,7 +1106,6 @@ command to generate the output files.
@@ -1180,7 +1153,6 @@ command to generate the output files.
<_comment>ODF template</_comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@ -236,15 +236,15 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="x-office-document"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1148,7 +1120,6 @@ command to generate the output files.
@@ -1195,7 +1167,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"/>
<alias type="application/vnd.sun.xml.base"/>
@@ -1157,7 +1128,6 @@ command to generate the output files.
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1211,7 +1182,6 @@ command to generate the output files.
<_comment>ODI image</_comment>
<acronym>ODI</acronym>
<expanded-acronym>OpenDocument Image</expanded-acronym>
@ -252,7 +252,7 @@ index 46dbfbd..bd3945d 100644
<generic-icon name="image-x-generic"/>
<magic priority="50">
<match type="string" value="PK\003\004" offset="0">
@@ -1170,7 +1140,6 @@ command to generate the output files.
@@ -1224,7 +1194,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.openofficeorg.extension">
<_comment>OpenOffice.org extension</_comment>
@ -261,5 +261,5 @@ index 46dbfbd..bd3945d 100644
<glob pattern="*.oxt" />
</mime-type>
--
1.9.0
2.7.4