X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=file.spec;h=83abbd8a48b864daa06e24fc51a90d5cbc7baa12;hb=3dcf03cd4a85386998a2009cc00d83f47d162473;hp=5ccf5dee2f9ffb1da51f9a56728c21260042c5d1;hpb=640647bdbc8838ff17023c62a62a1bc8f499ba38;p=packages%2Ffile.git

diff --git a/file.spec b/file.spec
index 5ccf5de..83abbd8 100644
--- a/file.spec
+++ b/file.spec
@@ -28,34 +28,32 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.08
+Version:	5.17
 Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	6a2a263c20278f01fe3bb0f720b27d4e
+# Source0-md5:	e19c47e069ced7b01ccb4db402cc01d3
 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
-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
 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
@@ -203,6 +201,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.
@@ -247,13 +246,10 @@ Wiązania Pythona dla libmagic.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
-%patch4 -p1
-%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch2 -p1
+%patch3 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -271,8 +267,9 @@ rm -f magic/Magdir/{*.orig,*~}
 %{__autoconf}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--enable-fsect-man5 \
-	%{!?with_static_libs:--enable-static=no}
+	%{?with_static_libs:--enable-static}
 
 %{__make}
 
@@ -306,6 +303,7 @@ cd ..
 %py_postclean
 %endif
 
+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}