commit 6b7924db369a742807c39679d7f6e148947c75fa
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Tue Jul 24 15:38:45 2012 +0100
Update to 1.35
- Update to 1.35:
- Explain how to use MIME::Types in mod_perl; when you do not read the
documentation about mod_perl/fork it will work as always, but
inefficiently
- subType() did not handle subType's with '+' in them
- Added video/webm and audio/webm, although not (yet) IANA registered
- BR: perl(Carp) and perl(Exporter)
- BR: at least version 1.00 of perl(Test::Pod)
- Use a patch rather than scripted iconv to fix character encooding
- Don't need to remove empty directories from the buildroot
- Drop %defattr, redundant since rpm 4.4
- Use %{_fixperms} macro rather than our own chmod incantation
- Use DESTDIR rather than PERL_INSTALL_ROOT
- Don't use macros for commands
- Make %files list more explicit
.gitignore | 2 +-
MIME-Types-1.31-utf8.patch | 50 ++++++++++++++++++++++++++++++++++++
perl-MIME-Types.spec | 60 ++++++++++++++++++++++++++-----------------
sources | 2 +-
4 files changed, 88 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 602b42c..47a4108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/MIME-Types-1.31.tar.gz
+/MIME-Types-[0-9.]*.tar.gz
diff --git a/MIME-Types-1.31-utf8.patch b/MIME-Types-1.31-utf8.patch
new file mode 100644
index 0000000..9fae114
--- /dev/null
+++ b/MIME-Types-1.31-utf8.patch
@@ -0,0 +1,50 @@
+--- MIME-Types-1.31/ChangeLog 2010-09-21 14:35:38.000000000 +0100
++++ MIME-Types-1.31/ChangeLog 2011-03-15 10:10:00.994144345 +0000
+@@ -136,7 +136,7 @@
+
+ version 1.14: Wed Nov 24 18:09:49 CET 2004
+
+- - [Ville Skytt�provided some minor fixes and two new types
++ - [Ville Skyttä] provided some minor fixes and two new types
+
+ - [Ave Wringley] contributed video/x-ms-wmv
+
+@@ -145,14 +145,14 @@
+
+ version 1.13: Sat Apr 24 00:15:09 CEST 2004
+
+- - [Ville Skytt�and [Austing Ziegler] updated the type list to
++ - [Ville Skyttä] and [Austing Ziegler] updated the type list to
+ IANA registry dated 2004-04-09. Many changes to clean-up the
+ list, trying to find a good balance between IANA's rules and
+ common practice.
+
+ version 1.12: Wed Jan 21 10:09:43 CET 2004
+
+- - [Ville Skytt�requested removal of application/excel, because
++ - [Ville Skyttä] requested removal of application/excel, because
+ it is not IANA registered. Applied.
+
+ - Documented that alternative types for a certain extension will
+@@ -163,7 +163,7 @@
+
+ version 1.11: Tue Jan 13 10:36:41 CET 2004
+
+- - [Ville Skytt�contributed a large set of new mime-types, and
++ - [Ville Skyttä] contributed a large set of new mime-types, and
+ applied some fixes. New IANA names are now all included.
+
+ version 1.10: Wed Dec 17 12:47:00 CET 2003
+@@ -203,10 +203,10 @@
+ - [Guangzu Wang] pointed to typos in the Synopsis of both packages:
+ $mimetype --> $mimetypes
+
+- - [Ville Skytt�some doc patches and many tweaks and additions
++ - [Ville Skyttä] some doc patches and many tweaks and additions
+ to the type list.
+
+- - [Ville Skytt�fixed bug, where the third column was taken as
++ - [Ville Skyttä] fixed bug, where the third column was taken as
+ second if that one was empty.
+
+ version 1.004: Tue Oct 22 19:22:43 CEST 2002
diff --git a/perl-MIME-Types.spec b/perl-MIME-Types.spec
index fb5e923..91d0ffb 100644
--- a/perl-MIME-Types.spec
+++ b/perl-MIME-Types.spec
@@ -1,19 +1,20 @@
Name: perl-MIME-Types
-Version: 1.31
-Release: 5%{?dist}
+Version: 1.35
+Release: 1%{?dist}
Summary: MIME types module for Perl
-
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/MIME-Types/
-Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MIME-Types-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MIME-Types-%{version}.tar.gz
+Patch0: MIME-Types-1.31-utf8.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
+BuildRequires: perl(Carp)
+BuildRequires: perl(Exporter)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)
-BuildRequires: perl(Test::Pod)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl(Test::Pod) >= 1.00
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%description
MIME types are used in MIME compliant lines, for instance as part of
@@ -24,42 +25,53 @@ one known mime type. There are many types defined by RFCs and vendors,
so the list is long but not complete. Please don't hesitate to ask to
add additional information.
-
%prep
%setup -q -n MIME-Types-%{version}
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+# Recode ChangeLog as UTF-8
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
-
%install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} %{buildroot}
%check
make test
make test TEST_FILES="xt/*.t"
-
%clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::Type*.3*
-
+%{_mandir}/man3/MIME::Type.3pm*
+%{_mandir}/man3/MIME::Types.3pm*
%changelog
+* Tue Jul 24 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 1.35-1
+- Update to 1.35:
+ - Explain how to use MIME::Types in mod_perl; when you do not read the
+ documentation about mod_perl/fork it will work as always, but
+ inefficiently
+ - subType() did not handle subType's with '+' in them
+ - Added video/webm and audio/webm, although not (yet) IANA registered
+- BR: perl(Carp) and perl(Exporter)
+- BR: at least version 1.00 of perl(Test::Pod)
+- Use a patch rather than scripted iconv to fix character encooding
+- Don't need to remove empty directories from the buildroot
+- Drop %%defattr, redundant since rpm 4.4
+- Use %%{_fixperms} macro rather than our own chmod incantation
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- Don't use macros for commands
+- Make %%files list more explicit
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.31-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 749072c..0fe85c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4435eb012e813682f94d285b40339ce MIME-Types-1.31.tar.gz
+0bba9902b326e03e376fe313b0fb239a MIME-Types-1.35.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
