From 88e5df88a02431f8856a1b6e8ba8f5f79f38789d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 19 Sep 2009 14:32:33 +0000
Subject: [PATCH] - Update to 2.1.30, see NEWS for details. - Improve summary
 and description. - Add MIT to License: for mailcap.4 man page. - Specfile
 cleanup.

---
 .cvsignore   |  2 +-
 COPYING      | 21 ---------------------
 mailcap.spec | 50 ++++++++++++++++++++++++++++++++++----------------
 sources      |  2 +-
 4 files changed, 36 insertions(+), 39 deletions(-)
 delete mode 100644 COPYING

diff --git a/.cvsignore b/.cvsignore
index f7d645c..06cb586 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mailcap-2.1.29.tar.gz
+mailcap-2.1.30.tar.gz
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 119b1e7..0000000
--- a/COPYING
+++ /dev/null
@@ -1,21 +0,0 @@
-Red Hat disclaims any copyright on the "mailcap" and "mime-types" files and places them in the public domain. You are 
-free to do whatever you wish with these files.
-
-The mailcap.4 man page is under an MIT license:
-
-Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-
-Permission to use, copy, modify, and distribute this material
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice and this permission notice
-appear in all copies, and that the name of Bellcore not be
-used in advertising or publicity pertaining to this
-material without the specific, prior written permission
-of an authorized representative of Bellcore.  BELLCORE
-MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
-WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-
-
-Tom Callaway, Fedora Legal, Red Hat
-Thu Sep 17, 2009
diff --git a/mailcap.spec b/mailcap.spec
index 6a337e3..62f325c 100644
--- a/mailcap.spec
+++ b/mailcap.spec
@@ -1,45 +1,63 @@
-Summary: Associates helper applications with particular file types
-Name: mailcap
-Version: 2.1.29
-Release: 3%{?dist}
-License: Public Domain
-Group: System Environment/Base
-Source0: https://fedorahosted.org/releases/m/a/mailcap/%{name}-%{version}.tar.gz
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           mailcap
+Version:        2.1.30
+Release:        1%{?dist}
+Summary:        Helper application and MIME type associations for file types
+
+Group:          System Environment/Base
+License:        Public Domain and MIT
+URL:            http://git.fedoraproject.org/git/mailcap.git
+Source0:        https://fedorahosted.org/released/mailcap/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 %description
 The mailcap file is used by the metamail program.  Metamail reads the
 mailcap file to determine how it should display non-text or multimedia
 material.  Basically, mailcap associates a particular type of file
 with a particular program that a mail agent or other program can call
-in order to handle the file.
+in order to handle the file.  Mailcap should be installed to allow
+certain programs to be able to handle non-text files.
+
+Also included in this package is the mime.types file which contains a
+list of MIME types and their filename "extension" associations, used
+by several applications e.g. to determine MIME types for filenames.
 
-Mailcap should be installed to allow certain programs to be able to
-handle non-text files.
 
 %prep
 %setup -q
 
+
 %build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 644 mailcap mime.types $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man4
-install -p -m 644 mailcap.4 $RPM_BUILD_ROOT%{_mandir}/man4
+make install DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} mandir=%{_mandir}
+
+
+%check
+make check
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
+%doc COPYING NEWS
 %config(noreplace) %{_sysconfdir}/mailcap
 %config(noreplace) %{_sysconfdir}/mime.types
 %{_mandir}/man4/mailcap.*
 
+
 %changelog
+* Sat Sep 19 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.1.30-1
+- Update to 2.1.30, see NEWS for details.
+- Improve summary and description.
+- Add MIT to License: for mailcap.4 man page.
+- Specfile cleanup.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.29-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 2c1625e..4f91f58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf60f7b3db605b4029b99bcb2966b9be  mailcap-2.1.29.tar.gz
+904ba32dedb36d8432943e8aaa5653fa  mailcap-2.1.30.tar.gz