X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=file.spec;h=a35601f08af2d92f012a1f38fa9584f946413a6f;hb=8c8a9ebd15260750c848c9c2fec0e2597f920616;hp=63bc2290618f858ed4888de2d3b9506fc0f35e40;hpb=f9961c0f862f78db59e2dd07ad05d7d5cb682754;p=packages%2Ffile.git

diff --git a/file.spec b/file.spec
index 63bc229..a35601f 100644
--- a/file.spec
+++ b/file.spec
@@ -2,7 +2,8 @@
 # Conditional build:
 %bcond_without	python		# don't build python-magic module
 %bcond_without	static_libs	# don't build static libraries
-#
+%bcond_without	tests		# don't perform "make check"
+
 Summary:	A utility for determining file types
 Summary(cs.UTF-8):	Program pro zjišťování typu souborů
 Summary(da.UTF-8):	Et værktøj til bestemmelse af filtyper
@@ -27,29 +28,32 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	4.23
-Release:	2
+Version:	5.08
+Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	014a69979a8d5225a6ca2bcc4d7e967e
-Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-# Source1-md5:	c157a183b64156f8baafaefd9cbf04c1
+# Source0-md5:	6a2a263c20278f01fe3bb0f720b27d4e
+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
-Patch0:		%{name}-debian.patch
+Source4:	%{name}-magic.mime-gen.awk
+#Patch0:		git.patch
 Patch1:		%{name}-sparc.patch
-Patch2:		%{name}-lmagic.patch
-Patch3:		%{name}-greedy-dump.patch
-Patch4:		%{name}-magic.patch
-Patch5:		%{name}-selinux.patch
-Patch6:		%{name}-msdos.patch
+Patch4:		%{name}-selinux.patch
+Patch6:		%{name}-fusecompress.patch
+Patch8:		%{name}-dbase.patch
+Patch9:		searchpath.patch
+Patch10:	automake.patch
+URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with python}
-BuildRequires:	python-devel >= 1:2.5
-BuildRequires:	python-modules >= 1:2.5
+BuildRequires:	python-devel
+BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
 %endif
 Requires:	libmagic = %{version}-%{release}
@@ -243,13 +247,19 @@ Wiązania Pythona dla libmagic.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+%if "%{cc_version}" < "3.4"
+%{__sed} -i -e 's,-Wextra,,' configure.ac
+%endif
+
+rm -f magic/Magdir/{*.orig,*~}
 
 %build
 %{__libtoolize}
@@ -265,10 +275,14 @@ Wiązania Pythona dla libmagic.
 
 %if %{with python}
 cd python
-python setup.py build
+%{__python} setup.py build
 cd ..
 %endif
 
+%if %{with tests}
+%{__make} check
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{_lib}
@@ -282,28 +296,22 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libmagic.so.*.*.*) \
 
 %if %{with python}
 cd python
-python setup.py install \
+%{__python} setup.py install \
 	--root=$RPM_BUILD_ROOT \
 	--optimize=2
 cd ..
+%py_postclean
 %endif
 
-install -D magic/magic.local $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
 
-cat %{SOURCE2} %{SOURCE3} >>$RPM_BUILD_ROOT%{_datadir}/file/magic
+./src/file -m $RPM_BUILD_ROOT%{_datadir}/misc/magic -c -C
+ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-
-# somebody forgot about patching in tarball
-mv -f $RPM_BUILD_ROOT%{_mandir}/pt_BR/man{4,5}
-sed -e 's/MAGIC 4/MAGIC 5/' $RPM_BUILD_ROOT%{_mandir}/pt_BR/man5/magic.4 \
-	> $RPM_BUILD_ROOT%{_mandir}/pt_BR/man5/magic.5
-rm -f $RPM_BUILD_ROOT%{_mandir}/pt_BR/man5/magic.4
-
-./src/file -m $RPM_BUILD_ROOT%{_datadir}/file/magic -c -C
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.file-non-english-man-pages
-rm -f $RPM_BUILD_ROOT%{_mandir}/file-magic4.diff
+%{__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
@@ -311,13 +319,27 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n libmagic -p /sbin/ldconfig
 %postun	-n libmagic -p /sbin/ldconfig
 
+%pretrans
+# it used to be directory
+if [ -d %{_datadir}/file -a ! -L %{_datadir}/file ]; then
+	mv -b %{_datadir}/file{,.dir}
+	ln -sn misc %{_datadir}/file
+%banner -e %{name} <<EOF
+Check %{_datadir}/file.dir for your own files and remove it when done.
+EOF
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog LEGAL.NOTICE README
+%doc ChangeLog COPYING README
 %attr(755,root,root) %{_bindir}/file
 %{_datadir}/file
+%{_datadir}/misc/magic
+%{_datadir}/misc/magic.mgc
+%{_datadir}/misc/magic.mime
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/magic
-%{_mandir}/man[15]/*
+%{_mandir}/man1/file.1*
+%{_mandir}/man5/magic.5*
 %lang(de) %{_mandir}/de/man[15]/*
 %lang(es) %{_mandir}/es/man[15]/*
 %lang(fr) %{_mandir}/fr/man[15]/*
@@ -349,6 +371,9 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python}
 %files -n python-magic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/magic.so
-%{py_sitedir}/Magic_file_extensions-*.egg-info
+%doc python/README python/example.py
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/Magic_file_extensions-*.egg-info
+%endif
+%{py_sitescriptdir}/magic.py[co]
 %endif