diff --git a/.cvsignore b/.cvsignore index 101317b..3f982f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -file-3.30.tar.gz -file-jman19991015.tar.gz +file-3.33.tar.gz diff --git a/file.spec b/file.spec index 2c41cad..34a2f2c 100644 --- a/file.spec +++ b/file.spec @@ -1,23 +1,15 @@ -%define enable_japanese 1 - Summary: A utility for determining file types. Name: file -Version: 3.30 -Release: 7j1 +Version: 3.33 +Release: 1 Copyright: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source1: magic.mime -# Japanese Source -Source10: file-jman19991015.tar.gz Patch0: file-3.27-rh.patch -Patch1: file-3.28-ia64.patch +Patch1: file-3.33-ia64.patch Patch2: file-3.30-magic5.patch Patch3: file-3.30-fnovfl.patch -Patch4: file-3.30-test.patch -# Japanese patch -Patch10: file-3.30-jtext.patch - Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root @@ -33,13 +25,9 @@ useful utility. %prep %setup -q %patch0 -p1 -%patch1 -p1 +%patch1 -p1 -b .ia64 %patch2 -p1 -b .magic5 %patch3 -p1 -b .fnovfl -%patch4 -p1 -b .test -%if %{enable_japanese} -%patch10 -p1 -b .jp1 -%endif %build @@ -51,7 +39,6 @@ make rm -rf $RPM_BUILD_ROOT mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ja/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -p ${RPM_BUILD_ROOT}%{_datadir} @@ -62,12 +49,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir} cp %SOURCE1 .%{_datadir}/magic.mime } -%if %{enable_japanese} -{ cd $RPM_BUILD_ROOT%{_mandir}/ja - tar zxvf %SOURCE10 -} -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -76,14 +57,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/magic* %{_mandir}/man*/* -%{_mandir}/ja/*/* %changelog -* Wed Aug 30 2000 ISHIKAWA Mutsumi -- applied a patch to detect japanese, from RH6.2J. -- ja patch: fixed patching to Makefile.in -- ja patch: changed the patch to be able to build in 3.30. -- Spefial Thanks for Masato Taruishi +* Sun Nov 26 2000 Jeff Johnson +- update to 3.33. * Mon Aug 14 2000 Preston Brown - Bill made the patch but didn't apply it. :) diff --git a/sources b/sources index 5ce2d35..5188f9a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -fe2c25b8709072beb12555473688cbdf file-3.30.tar.gz -1b1d6713cc6324b556fa4552242b1a01 file-jman19991015.tar.gz +3b8e32ed3a79774bd92f0052fa07ca04 file-3.33.tar.gz