backport no_fake_mimetypes fix for f24+ (reviewboard#117135)
This commit is contained in:
Rex Dieter
parent
7ad5094d62
commit
d822f8a9af
|
|
@ -0,0 +1,128 @@
|
|||
diff -up kdelibs-4.14.23/mimetypes/kde.xml.no_fake_mimetypes kdelibs-4.14.23/mimetypes/kde.xml
|
||||
--- kdelibs-4.14.23/mimetypes/kde.xml.no_fake_mimetypes 2016-08-16 09:04:01.000000000 -0500
|
||||
+++ kdelibs-4.14.23/mimetypes/kde.xml 2016-08-28 08:39:55.307237091 -0500
|
||||
@@ -1786,124 +1786,6 @@ Notes:
|
||||
<glob pattern="*.abc"/>
|
||||
</mime-type>
|
||||
|
||||
- <!-- all/ fake mime types -->
|
||||
- <mime-type type="all/all">
|
||||
- <comment>all files and folders</comment>
|
||||
- <comment xml:lang="ar">كل الملفات و المجلدات</comment>
|
||||
- <comment xml:lang="ast">tolos ficheros y carpetes</comment>
|
||||
- <comment xml:lang="bg">всички файлове и папки</comment>
|
||||
- <comment xml:lang="bs">sve datoteke i direktorije</comment>
|
||||
- <comment xml:lang="ca">tots els fitxers i carpetes</comment>
|
||||
- <comment xml:lang="ca@valencia">tots els fitxers i carpetes</comment>
|
||||
- <comment xml:lang="cs">všechny soubory a složky</comment>
|
||||
- <comment xml:lang="da">alle filer og mapper</comment>
|
||||
- <comment xml:lang="de">Alle Dateien und Ordner</comment>
|
||||
- <comment xml:lang="el">Όλα τα αρχεία και οι φάκελοι</comment>
|
||||
- <comment xml:lang="en_GB">all files and folders</comment>
|
||||
- <comment xml:lang="es">todos los archivos y carpetas</comment>
|
||||
- <comment xml:lang="et">kõik failid ja kataloogid</comment>
|
||||
- <comment xml:lang="eu">fitxategi eta karpeta denak</comment>
|
||||
- <comment xml:lang="fi">kaikki tiedostot ja kansiot</comment>
|
||||
- <comment xml:lang="fr">Tous les fichiers et les dossiers</comment>
|
||||
- <comment xml:lang="ga">gach comhad agus fillteán</comment>
|
||||
- <comment xml:lang="gl">todos os ficheiros e cartafoles</comment>
|
||||
- <comment xml:lang="hr">sve datoteke i direktoriji</comment>
|
||||
- <comment xml:lang="hu">minden fájl és mappa</comment>
|
||||
- <comment xml:lang="ia">omne files e dossieres</comment>
|
||||
- <comment xml:lang="is">allar skrár og möppur</comment>
|
||||
- <comment xml:lang="it">tutti i file e le cartelle</comment>
|
||||
- <comment xml:lang="ja">すべてのファイルとフォルダ</comment>
|
||||
- <comment xml:lang="kk">бүкіл файлдар мен қапшықтар</comment>
|
||||
- <comment xml:lang="km">ឯកសារ និងថតទាំងអស់</comment>
|
||||
- <comment xml:lang="ko">모든 파일과 폴더</comment>
|
||||
- <comment xml:lang="lt">visi failai ir aplankai</comment>
|
||||
- <comment xml:lang="lv">visi faili un mapes</comment>
|
||||
- <comment xml:lang="ml">എല്ലാ ഫയലും ഫോള്ഡറുകളും</comment>
|
||||
- <comment xml:lang="mr">सर्व फाईल्स व संचयीका</comment>
|
||||
- <comment xml:lang="nb">al.le filer og mapper</comment>
|
||||
- <comment xml:lang="nds">All Dateien un Ornern</comment>
|
||||
- <comment xml:lang="nl">alle bestanden en mappen</comment>
|
||||
- <comment xml:lang="nn">alle filer og mapper</comment>
|
||||
- <comment xml:lang="pa">ਸਭ ਫਾਇਲਾਂ ਅਤੇ ਫੋਲਡਰ</comment>
|
||||
- <comment xml:lang="pl">wszystkie pliki i katalogi</comment>
|
||||
- <comment xml:lang="pt">todos os ficheiros e pastas</comment>
|
||||
- <comment xml:lang="pt_BR">todos os arquivos e pastas</comment>
|
||||
- <comment xml:lang="ro">toate fișierele și dosarele</comment>
|
||||
- <comment xml:lang="ru">все файлы и папки</comment>
|
||||
- <comment xml:lang="se">buot fiillat ja máhpat</comment>
|
||||
- <comment xml:lang="sk">všetky súbory a priečinky</comment>
|
||||
- <comment xml:lang="sl">vse datoteke in mape</comment>
|
||||
- <comment xml:lang="sr">сви фајлови и фасцикле</comment>
|
||||
- <comment xml:lang="sr@ijekavian">сви фајлови и фасцикле</comment>
|
||||
- <comment xml:lang="sr@ijekavianlatin">svi fajlovi i fascikle</comment>
|
||||
- <comment xml:lang="sr@latin">svi fajlovi i fascikle</comment>
|
||||
- <comment xml:lang="sv">alla filer och kataloger</comment>
|
||||
- <comment xml:lang="th">แฟ้มและโฟลเดอร์ทั้งหมด</comment>
|
||||
- <comment xml:lang="tr">tüm dosyalar ve dizinler</comment>
|
||||
- <comment xml:lang="ug">ھەممە ھۆججەت ۋە قىسقۇچلار</comment>
|
||||
- <comment xml:lang="uk">всі файли і теки</comment>
|
||||
- <comment xml:lang="zh_CN">全部文件和文件夹</comment>
|
||||
- <comment xml:lang="zh_TW">所有檔案與資料夾</comment>
|
||||
- </mime-type>
|
||||
- <mime-type type="all/allfiles">
|
||||
- <comment>all files</comment>
|
||||
- <comment xml:lang="ar">كل الملفات</comment>
|
||||
- <comment xml:lang="ast">tolos ficheros</comment>
|
||||
- <comment xml:lang="bg">всички файлове</comment>
|
||||
- <comment xml:lang="bs">sve datoteke</comment>
|
||||
- <comment xml:lang="ca">tots els fitxers</comment>
|
||||
- <comment xml:lang="ca@valencia">tots els fitxers</comment>
|
||||
- <comment xml:lang="cs">všechny soubory</comment>
|
||||
- <comment xml:lang="da">alle filer</comment>
|
||||
- <comment xml:lang="de">Alle Dateien</comment>
|
||||
- <comment xml:lang="el">Όλα τα αρχεία</comment>
|
||||
- <comment xml:lang="en_GB">all files</comment>
|
||||
- <comment xml:lang="es">todos los archivos</comment>
|
||||
- <comment xml:lang="et">kõik failid</comment>
|
||||
- <comment xml:lang="eu">fitxategi denak</comment>
|
||||
- <comment xml:lang="fi">kaikki tiedostot</comment>
|
||||
- <comment xml:lang="fr">Tous les fichiers</comment>
|
||||
- <comment xml:lang="ga">gach comhad</comment>
|
||||
- <comment xml:lang="gl">todos os ficheiros</comment>
|
||||
- <comment xml:lang="hr">sve datoteke</comment>
|
||||
- <comment xml:lang="hu">minden fájl</comment>
|
||||
- <comment xml:lang="ia">omne files</comment>
|
||||
- <comment xml:lang="is">allar skrár</comment>
|
||||
- <comment xml:lang="it">tutti i file</comment>
|
||||
- <comment xml:lang="ja">すべてのファイル</comment>
|
||||
- <comment xml:lang="kk">бүкіл файлдар</comment>
|
||||
- <comment xml:lang="km">ឯកសារទាំងអស់</comment>
|
||||
- <comment xml:lang="ko">모든 파일</comment>
|
||||
- <comment xml:lang="lt">visi failai</comment>
|
||||
- <comment xml:lang="lv">visi faili</comment>
|
||||
- <comment xml:lang="ml">എല്ലാ ഫയലും</comment>
|
||||
- <comment xml:lang="mr">सर्व फाईल्स</comment>
|
||||
- <comment xml:lang="nb">alle filer</comment>
|
||||
- <comment xml:lang="nds">All Dateien</comment>
|
||||
- <comment xml:lang="nl">alle bestanden</comment>
|
||||
- <comment xml:lang="nn">alle filer</comment>
|
||||
- <comment xml:lang="pa">ਸਭ ਫਾਇਲਾਂ</comment>
|
||||
- <comment xml:lang="pl">wszystkie pliki</comment>
|
||||
- <comment xml:lang="pt">todos os ficheiros</comment>
|
||||
- <comment xml:lang="pt_BR">todos os arquivos</comment>
|
||||
- <comment xml:lang="ro">toate fișierele</comment>
|
||||
- <comment xml:lang="ru">все файлы</comment>
|
||||
- <comment xml:lang="se">buot fiillat</comment>
|
||||
- <comment xml:lang="sk">všetky súbory</comment>
|
||||
- <comment xml:lang="sl">vse datoteke</comment>
|
||||
- <comment xml:lang="sr">сви фајлови</comment>
|
||||
- <comment xml:lang="sr@ijekavian">сви фајлови</comment>
|
||||
- <comment xml:lang="sr@ijekavianlatin">svi fajlovi</comment>
|
||||
- <comment xml:lang="sr@latin">svi fajlovi</comment>
|
||||
- <comment xml:lang="sv">alla filer</comment>
|
||||
- <comment xml:lang="th">แฟ้มทั้งหมด</comment>
|
||||
- <comment xml:lang="tr">tüm dosyalar</comment>
|
||||
- <comment xml:lang="ug">ھەممە ھۆججەتلەر</comment>
|
||||
- <comment xml:lang="uk">всі файли</comment>
|
||||
- <comment xml:lang="zh_CN">全部文件</comment>
|
||||
- <comment xml:lang="zh_TW">所有檔案</comment>
|
||||
- </mime-type>
|
||||
-
|
||||
<mime-type type="application/vnd.kde.fontspackage">
|
||||
<sub-class-of type="application/zip"/>
|
||||
<comment>fonts package</comment>
|
||||
12
kdelibs.spec
12
kdelibs.spec
|
|
@ -51,7 +51,7 @@ Summary: KDE Libraries
|
|||
# shipped with kde applications, version...
|
||||
%global apps_version 16.08.0
|
||||
Version: 4.14.23
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -110,6 +110,10 @@ Recommends: kde-style-breeze%{?_isa}
|
|||
# make kdelibs-devel parallel-installable with kdelibs3-devel
|
||||
Patch0: kdelibs-4.9.95-parallel_devel.patch
|
||||
|
||||
# backport: omit fake mimetypes
|
||||
# https://git.reviewboard.kde.org/r/117135/
|
||||
Patch1: kdelibs-no_fake_mimetypes.patch
|
||||
|
||||
# fix http://bugs.kde.org/149705
|
||||
Patch2: kdelibs-4.10.0-kde149705.patch
|
||||
|
||||
|
|
@ -451,6 +455,9 @@ format for use with the Qt 4 Assistant or KDevelop 4.
|
|||
%setup -q -n kdelibs-%{version}
|
||||
|
||||
%patch0 -p1 -b .parallel_devel
|
||||
%if 0%{?fedora} > 23
|
||||
%patch1 -p1 -b .no_fake_mimetypes
|
||||
%endif
|
||||
%patch2 -p1 -b .kde149705
|
||||
%patch8 -p1 -b .install_all_css
|
||||
%patch9 -p1 -b .branding
|
||||
|
|
@ -867,6 +874,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Aug 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-5
|
||||
- backport no_fake_mimetypes fix for f24+ (reviewboard#117135)
|
||||
|
||||
* Thu Aug 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-4
|
||||
- pull in upstream fixes
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue