diff --git a/.cvsignore b/.cvsignore index 3b2523e..141fe48 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-4.14.tar.gz +file-4.15.tar.gz diff --git a/file.spec b/file.spec index 706f745..b83e600 100644 --- a/file.spec +++ b/file.spec @@ -2,8 +2,8 @@ Summary: A utility for determining file types. Name: file -Version: 4.14 -Release: 4 +Version: 4.15 +Release: 1 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -13,9 +13,6 @@ Patch2: file-selinux.patch Patch3: file-4.14-magic.patch Patch5: file-4.13-fsdump.patch Patch6: file-4.13-quick.patch -Patch7: file-4.14-magic_mime.patch -Patch8: file-4.14-kill3ds.patch -Patch9: file-4.14-aac.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -30,15 +27,12 @@ useful utility. %prep %setup -q -%patch0 -p1 -b .rh +#%patch0 -p1 -b .rh %patch1 -p1 -b .debian %patch2 -p1 -b .selinux %patch3 -p1 -b .magic %patch5 -p1 -b .fsdump %patch6 -p1 -b .quick -%patch7 -b .magic_mime -%patch8 -p1 -b .kill3ds -%patch9 -p1 -b .acc iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -83,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libmagic.* %changelog +* Thu Aug 09 2005 Radek Vokal - 4.15-1 +- upgrade to upstream + * Tue Aug 09 2005 Radek Vokal - 4.14-4 - mime for mpeg and aac files fixed (#165323) diff --git a/sources b/sources index f64111e..52d8fef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66983e60087e8bcd588c8ab38a861af0 file-4.14.tar.gz +09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz