packages: mailcap/mailcap.spec, mailcap/mime.types.patch (NEW) - re-add .ga...

[glen]

Author: glen                         Date: Thu Aug 26 16:30:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- re-add .gadget -> application/x-windows-gadget (mime.types r1.15)

---- Files affected:
packages/mailcap:
   mailcap.spec (1.61 -> 1.62) , mime.types.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mailcap/mailcap.spec
diff -u packages/mailcap/mailcap.spec:1.61 packages/mailcap/mailcap.spec:1.62
--- packages/mailcap/mailcap.spec:1.61	Sat Mar 27 20:01:28 2010
+++ packages/mailcap/mailcap.spec	Thu Aug 26 18:30:36 2010
@@ -2,8 +2,8 @@
 # TODO
 # - use IANA as source http://www.iana.org/assignments/media-types/ ?
 %bcond_without	tests
-#
-%define	fcver	2.1.31
+
+%define		fcver	2.1.31
 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
@@ -16,12 +16,13 @@
 Release:	4
 License:	Public Domain
 Group:		Base
-Source0:	https://fedorahosted.org/released/mailcap/mailcap-%{fcver}.tar.gz
+Source0:	https://fedorahosted.org/released/mailcap/%{name}-%{fcver}.tar.gz
 # Source0-md5:	54f487f4038b703a3e87c2b95334857d
 Source1:	%{name}
 Source2:	%{name}.4
 Source3:	run-%{name}
 Source4:	run-%{name}.man
+Patch0:		mime.types.patch
 BuildRequires:	rpm >= 4.4.9-56
 Suggests:	ImageMagick-coder-jpeg
 Suggests:	ImageMagick-coder-png
@@ -56,8 +57,8 @@
 %else
 Suggests:	xterm
 %endif
-Conflicts:	rpm < 4.4.9
 %{?with_tests:BuildRequires:perl-base}
+Conflicts:	rpm < 4.4.9
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -100,6 +101,7 @@
 
 %prep
 %setup -q -n %{name}-%{fcver}
+%patch0 -p1
 cp -a %{SOURCE1} mailcap
 
 %if "%{pld_release}" == "ac"
@@ -135,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2010/08/26 16:30:36  glen
+- re-add .gadget -> application/x-windows-gadget (mime.types r1.15)
+
 Revision 1.61  2010/03/27 19:01:28  gotar
 - rel. 4; updated run-mailcap and manpages from Debian's mime-support 3.48
 

================================================================
Index: packages/mailcap/mime.types.patch
diff -u /dev/null packages/mailcap/mime.types.patch:1.1
--- /dev/null	Thu Aug 26 18:30:42 2010
+++ packages/mailcap/mime.types.patch	Thu Aug 26 18:30:36 2010
@@ -0,0 +1,10 @@
+--- mailcap-2.1.31/mime.types~	2009-11-17 23:13:33.000000000 +0200
++++ mailcap-2.1.31/mime.types	2010-08-26 19:28:52.629404880 +0300
+@@ -843,6 +843,7 @@
+ application/xop+xml				xop
+ application/xslt+xml				xsl xslt
+ application/xv+xml				mxml xhvml xvml xvm
++application/x-windows-gadget	gadget
+ application/zip					zip
+ audio/32kadpcm					726
+ # 3gp, 3gpp: video/3gpp
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mailcap/mailcap.spec?r1=1.61&r2=1.62&f=u