From 195cdc8b79f7d165dadfa32ec4db98ee4aa13261 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Tue, 5 May 2009 09:49:15 +0000 Subject: [PATCH] new upstream version 5.02 --- .cvsignore | 2 +- file.spec | 27 ++++++++------------------- sources | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.cvsignore b/.cvsignore index b6ce673..245622b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-5.00.tar.gz +file-5.02.tar.gz diff --git a/file.spec b/file.spec index 48ede7e..80fb430 100644 --- a/file.spec +++ b/file.spec @@ -4,20 +4,15 @@ Summary: A utility for determining file types Name: file -Version: 5.00 -Release: 8%{?dist} +Version: 5.02 +Release: 1%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ Patch0: file-4.21-pybuild.patch Patch1: file-5.00-devdrv.patch -Patch2: file-5.00-non-english-word.patch -Patch3: file-5.00-thumbs-db.patch -Patch4: file-5.00-fonts-ttc-pfa.patch -Patch5: file-5.00-fdleak.patch -Patch6: file-5.00-mdmp.patch -Patch7: file-5.00-erlang.patch +Patch2: file-5.00-mdmp.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,18 +61,8 @@ file(1) command. %patch0 -p1 #fixes #463809 %patch1 -p1 -#fixes #485141 -%patch2 -p1 -#fixes #486105 -%patch3 -p1 -#fixes #491594,#491595 -%patch4 -p1 -#fixes #491596 -%patch5 -p1 #fixes #485835 -%patch6 -p1 -#fixes #498036 -%patch7 -p1 +%patch2 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -100,6 +85,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/misc +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/file make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la @@ -151,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue May 05 2009 Daniel Novotny 5.02-1 +- new upstream version; drop upstreamed patches; this fixes #497913 + * Wed Apr 29 2009 Daniel Novotny 5.00-8 - fix #498036 - Elang JAM file definition breaks detection of postscript-files diff --git a/sources b/sources index 6b1ca12..80580b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd0b4ce55a756151629e06eaa3411e0c file-5.00.tar.gz +003c56bd1a130390522b45ebcd5ac179 file-5.02.tar.gz