- updated to 5.12

[packages/file.git] / file.spec

diff --git a/file.spec b/file.spec
index 2d1703d21a8ed053f43fa88d9e4ca2959a052d35..4d0ad0e3a8c53c101da1f7aa7ddd7e152ce3c6b2 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -28,35 +28,33 @@ Summary(uk.UTF-8):  Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):  判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
-Version:       5.07
-Release:       2
+Version:       5.12
+Release:       1
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: b8d1f9a8a644067bd0a703cebf3f4858
+# Source0-md5: 1d7d85cb9354f79e5e351deef36be6ba
 Source1:       http://ftp1.pld-linux.org/people/glen/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 6a45bcaefd19b94db36a1b2b7c5b806b
 Source2:       %{name}-zisofs.magic
 Source3:       %{name}-mscompress.magic
 Source4:       %{name}-magic.mime-gen.awk
-Patch0:                git.patch
-Patch1:                %{name}-sparc.patch
-Patch3:                %{name}-greedy-dump.patch
-Patch4:                %{name}-selinux.patch
-Patch6:                %{name}-fusecompress.patch
-Patch8:                %{name}-dbase.patch
-Patch9:                searchpath.patch
-Patch10:       automake.patch
+Patch0:                %{name}-sparc.patch
+Patch1:                %{name}-selinux.patch
+Patch2:                searchpath.patch
+Patch3:                automake.patch
+Patch4:                sticky-bit.patch
 URL:           http://www.darwinsys.com/file/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.0
 BuildRequires: rpmbuild(macros) >= 1.453
 %if %{with python}
 BuildRequires: python-devel
 BuildRequires: python-modules
 BuildRequires: rpm-pythonprov
 %endif
+BuildRequires: zlib-devel
 Requires:      libmagic = %{version}-%{release}
 Conflicts:     rpm-build < 4.4.1-9
 Conflicts:     xdelta < 1.0.0
@@ -204,6 +202,7 @@ Summary:    Header files for libmagic library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libmagic
 Group:         Development/Libraries
 Requires:      libmagic = %{version}-%{release}
+Requires:      zlib-devel
 
 %description -n libmagic-devel
 Library of functions which operate on magic database file.
@@ -250,17 +249,17 @@ Wiązania Pythona dla libmagic.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
-%if "%{cc_release}" < "3.4"
+%if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
 %endif
 
+cp -p %{SOURCE3} magic/Magdir/mscompress
+cp -p %{SOURCE2} magic/Magdir/zisofs
+
 rm -f magic/Magdir/{*.orig,*~}
 
 %build
@@ -271,13 +270,13 @@ rm -f magic/Magdir/{*.orig,*~}
 %{__automake}
 %configure \
        --enable-fsect-man5 \
-       %{!?with_static_libs:--enable-static=no}
+       %{?with_static_libs:--enable-static}
 
 %{__make}
 
 %if %{with python}
 cd python
-python setup.py build
+%{__python} setup.py build
 cd ..
 %endif
 
@@ -305,18 +304,12 @@ cd ..
 %py_postclean
 %endif
 
-install -D magic/Localstuff $RPM_BUILD_ROOT%{_sysconfdir}/magic
-
-cat magic/Header magic/Magdir/* %{SOURCE2} %{SOURCE3} >$RPM_BUILD_ROOT%{_datadir}/misc/magic
 awk -f %{SOURCE4} < $RPM_BUILD_ROOT%{_datadir}/misc/magic > $RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
+ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-
-src/file -m $RPM_BUILD_ROOT%{_datadir}/misc/magic -c -C
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
-rm -f $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
-
-ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -328,7 +321,7 @@ rm -rf $RPM_BUILD_ROOT
 # it used to be directory
 if [ -d %{_datadir}/file -a ! -L %{_datadir}/file ]; then
        mv -b %{_datadir}/file{,.dir}
-       ln -s misc %{_datadir}/file
+       ln -sn misc %{_datadir}/file
 %banner -e %{name} <<EOF
 Check %{_datadir}/file.dir for your own files and remove it when done.
 EOF