[packages/mailcap] Up to 2.1.54; dropped entries that are already in upstream
arekm
arekm at pld-linux.org
Sat Mar 14 01:18:27 CET 2026
commit 12f06eb54bee09e523ea89bf46311de71f363b2a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 14 01:18:19 2026 +0100
Up to 2.1.54; dropped entries that are already in upstream
mailcap.spec | 13 ++++---
mime.types.patch | 102 ++++++-------------------------------------------------
2 files changed, 17 insertions(+), 98 deletions(-)
---
diff --git a/mailcap.spec b/mailcap.spec
index 7c3d0da..24e910a 100644
--- a/mailcap.spec
+++ b/mailcap.spec
@@ -5,7 +5,7 @@
# Conditional build:
%bcond_without tests # do not perform "make check"
-%define fcver 2.1.45
+%define fcver 2.1.54
%define ver 2.3.%(v=%{fcver}; echo ${v#2.1.})
Summary: Defines multimedia helper applications for various programs
Summary(de.UTF-8): Definiert Multimedia-Hilfsapplikationen für diverse Programme
@@ -16,11 +16,11 @@ Summary(pt_BR.UTF-8): Define aplicações auxiliares multimídia para vários pr
Summary(tr.UTF-8): Çeşitli programlar için çokluortam yardımcı uygulamaları tanımlar
Name: mailcap
Version: %{ver}
-Release: 4
+Release: 1
License: Public Domain
Group: Base
-Source0: https://fedorahosted.org/released/mailcap/%{name}-%{fcver}.tar.xz
-# Source0-md5: d8d66b3a458f0da327a7c4edfff911a1
+Source0: https://pagure.io/mailcap/archive/r2-1-54/%{name}-r2-1-54.tar.gz
+# Source0-md5: 44960f1b89c0cc9ca788a39981e1973d
Source1: %{name}
Source2: %{name}.4
# https://anonscm.debian.org/git/collab-maint/mime-support.git/log/run-mailcap
@@ -28,10 +28,9 @@ Source3: run-%{name}
Source4: run-%{name}.man
Patch0: mime.types.patch
Patch1: run-mailcap-mktemp.patch
-URL: http://git.fedorahosted.org/git/?p=mailcap.git
+URL: https://pagure.io/mailcap
BuildRequires: rpm >= 4.4.9-56
BuildRequires: tar >= 1:1.22
-BuildRequires: xz
Suggests: ImageMagick-coder-jpeg
Suggests: ImageMagick-coder-png
Suggests: aview
@@ -110,7 +109,7 @@ lynx gibi programların resim göstermek için otomatik olarak zgv
paketini kullanamalarına olanak sağlar (zgv kurulmuş olmalı).
%prep
-%setup -q -n %{name}-%{fcver}
+%setup -q -n %{name}-r2-1-54
%patch -P0 -p1
cp -a %{SOURCE1} %{SOURCE3} .
%patch -P1
diff --git a/mime.types.patch b/mime.types.patch
index 1ecb1b3..a980112 100644
--- a/mime.types.patch
+++ b/mime.types.patch
@@ -1,83 +1,6 @@
-
-use .ico for favicon:
-https://en.wikipedia.org/wiki/ICO_%28file_format%29
-
-add .woff2 and update other font types
-http://dev.w3.org/webfonts/WOFF2/spec/
-
---- mailcap-2.1.45/mime.types 2015-09-25 08:37:37.000000000 +0300
-+++ mailcap-2.1.45/mime.types 2015-11-30 00:44:22.264811464 +0200
-@@ -99,9 +99,9 @@
- application/fdt+xml fdt
- # fits, fit, fts: image/fits
- application/fits
--application/font-sfnt ttf
-+application/font-sfnt
- application/font-tdpfr pfr
--application/font-woff woff
-+application/font-woff
- application/framework-attributes+xml
- application/gzip gz tgz
- application/H224
-@@ -799,7 +799,7 @@
- application/vnd.oasis.opendocument.chart-template otc
- application/vnd.oasis.opendocument.database odb
- application/vnd.oasis.opendocument.formula odf
--application/vnd.oasis.opendocument.formula-template otf
-+application/vnd.oasis.opendocument.formula-template
- application/vnd.oasis.opendocument.graphics odg
- application/vnd.oasis.opendocument.graphics-template otg
- application/vnd.oasis.opendocument.image odi
-@@ -1174,6 +1174,8 @@
- application/xcon-conference-info-diff+xml
- application/xcon-conference-info+xml
- application/xenc+xml
-+application/x-rar-compressed rar
-+application/x-windows-gadget gadget
- application/xhtml+xml xhtml xhtm xht
- # xml, xsd, rng: text/xml
- application/xml
-@@ -1380,7 +1382,7 @@
- image/vnd.fujixerox.edmics-mmr mmr
- image/vnd.fujixerox.edmics-rlc rlc
- image/vnd.globalgraphics.pgb pgb
--image/vnd.microsoft.icon ico
-+image/vnd.microsoft.icon
- image/vnd.mix
- image/vnd.mozilla.apng apng
- image/vnd.ms-modi mdi
-@@ -1395,6 +1397,7 @@
- image/vnd.wap.wbmp wbmp
- image/vnd.xiff xif
- image/vnd.zbrush.pcx pcx
-+image/x-icon ico
- message/CPIM
- message/delivery-status
- message/disposition-notification
-@@ -1525,6 +1528,7 @@
- text/vnd.wap.sl sl
- text/vnd.wap.wml wml
- text/vnd.wap.wmlscript wmls
-+text/x-component htc
- text/xml xml xsd rng
- text/xml-external-parsed-entity ent
- video/1d-interleaved-parityfec
-@@ -1671,6 +1675,7 @@
- application/x-troff-ms ms
- application/x-ustar ustar
- application/x-wais-source src
-+application/x-x509-ca-cert crt
- application/x-xpinstall xpi
- application/x-xspf+xml xspf
- application/x-xz xz
-@@ -1701,10 +1706,14 @@
- image/x-xbitmap xbm
- image/x-xpixmap xpm
- image/x-xwindowdump xwd
-+font/otf otf
-+font/ttf ttf
-+font/woff woff
-+font/woff2 woff2
+--- mailcap-r2-1-54.orig/mime.types 2023-05-23 18:18:12.000000000 +0200
++++ mailcap-r2-1-54/mime.types 2026-03-14 01:16:13.146015595 +0100
+@@ -2247,7 +2247,7 @@
text/html-sandboxed sandboxed
text/x-pod pod
text/x-setext etx
@@ -86,14 +9,11 @@ http://dev.w3.org/webfonts/WOFF2/spec/
video/x-annodex axv
video/x-flv flv
video/x-javafx fxm
---- mailcap-2.1.45/test.pl~ 2015-09-25 08:37:37.000000000 +0300
-+++ mailcap-2.1.45/test.pl 2015-11-30 08:37:58.326283402 +0200
-@@ -7,7 +7,7 @@
- my %toplevel;
-
- my %good_toplevel = map { $_ => 1 }
-- qw(application audio chemical image message model multipart text video
-+ qw(application audio chemical font image message model multipart text video
- x-conference x-epoc);
-
- while (<>) {
+@@ -2262,3 +2262,7 @@
+ video/x-sgi-movie movie
+ x-conference/x-cooltalk ice
+ x-epoc/x-sisx-app sisx
++
++# PLD additions
++application/x-windows-gadget gadget
++text/x-component htc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mailcap.git/commitdiff/12f06eb54bee09e523ea89bf46311de71f363b2a
More information about the pld-cvs-commit
mailing list