commit 67de061bf23be2e52c87671655d01d080b4e2f4a
Author: Elan Ruusamäe <[email protected]>
Date: Wed Sep 18 18:41:19 2013 +0300
up to fedora mailcap to 2.1.41, call our version 2.3.41
mailcap.spec | 11 ++++++-----
mime.types.patch | 45 ++++++++++++++++++---------------------------
2 files changed, 24 insertions(+), 32 deletions(-)
---
diff --git a/mailcap.spec b/mailcap.spec
index f7c13f6..e951674 100644
--- a/mailcap.spec
+++ b/mailcap.spec
@@ -4,8 +4,9 @@
#
# Conditional build:
%bcond_without tests # do not perform "make check"
-#
-%define fcver 2.1.38
+
+%define fcver 2.1.41
+%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
Summary(es.UTF-8): Define aplicaciones auxiliares multimedia para varios
programas
@@ -14,12 +15,12 @@ Summary(pl.UTF-8): Definicje rozszerzeń multimedialnych
dla różnych programó
Summary(pt_BR.UTF-8): Define aplicações auxiliares multimídia para vários
programas
Summary(tr.UTF-8): Çeşitli programlar için çokluortam yardımcı
uygulamaları tanımlar
Name: mailcap
-Version: 2.3
-Release: 7
+Version: %{ver}
+Release: 1
License: Public Domain
Group: Base
Source0:
https://fedorahosted.org/released/mailcap/%{name}-%{fcver}.tar.xz
-# Source0-md5: a7b46a45e48e77ef44b50dcd95c28f20
+# Source0-md5: 9163cd0688dc5dd6cdd2ecb55e628692
Source1: %{name}
Source2: %{name}.4
Source3: run-%{name}
diff --git a/mime.types.patch b/mime.types.patch
index e3cf0fb..7bea1ff 100644
--- a/mime.types.patch
+++ b/mime.types.patch
@@ -1,32 +1,14 @@
-diff -urN mailcap-2.1.38.org/mime.types mailcap-2.1.38/mime.types
---- mailcap-2.1.38.org/mime.types 2011-08-16 11:03:33.000000000 +0200
-+++ mailcap-2.1.38/mime.types 2013-01-22 14:16:49.790438384 +0100
-@@ -568,7 +568,7 @@
- application/vnd.ms-office.activeX+xml
- application/vnd.ms-officetheme thmx
- application/vnd.ms-playready.initiator+xml
--application/vnd.ms-powerpoint ppt
-+application/vnd.ms-powerpoint ppt pps
- application/vnd.ms-powerpoint.addin.macroEnabled.12 ppam
- application/vnd.ms-powerpoint.presentation.macroEnabled.12 pptm
- application/vnd.ms-powerpoint.slide.macroEnabled.12 sldm
-@@ -990,6 +990,8 @@
- application/yang yang
- application/yin+xml yin
- application/zip zip
+--- mailcap-2.1.40/mime.types~ 2013-09-18 18:33:48.000000000 +0300
++++ mailcap-2.1.40/mime.types 2013-09-18 18:34:43.827318330 +0300
+@@ -1011,6 +1011,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
- audio/1d-interleaved-parityfec
- audio/32kadpcm 726
- # 3gp, 3gpp: video/3gpp
-@@ -1133,6 +1135,7 @@
- audio/vnd.vmx.cvsd
- audio/vorbis
- audio/vorbis-config
-+audio/webm weba
- image/cgm
- image/fits fits fit fts
- image/g3fax
+ application/xhtml+xml xhtml xhtm xht
+ # application/xhtml-voice+xml obsoleted by application/xv+xml
+ # xml, xsd, rng: text/xml
@@ -1165,7 +1168,7 @@
image/vnd.fujixerox.edmics-mmr mmr
image/vnd.fujixerox.edmics-rlc rlc
@@ -60,3 +42,12 @@ diff -urN mailcap-2.1.38.org/mime.types
mailcap-2.1.38/mime.types
application/x-xpinstall xpi
application/x-xspf+xml xspf
application/x-xz xz
+@@ -1542,7 +1542,7 @@
+ text/html-sandboxed sandboxed
+ text/x-pod pod
+ text/x-setext etx
+-video/webm webm
++video/webm webm weba
+ video/x-annodex axv
+ video/x-flv flv
+ video/x-javafx fxm
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mailcap.git/commitdiff/67de061bf23be2e52c87671655d01d080b4e2f4a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
