X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=file.spec;h=e7a0a0bef1ce2656748ed4a034e8ca4831a6c987;hb=ee8f30d2775694fd402e7a748b5670a7a4d1c50d;hp=079c6f90049f775bf15c693b4d01b6dd432c365b;hpb=87044beb6e9f2a06d2633632242fb68c05aee3d9;p=packages%2Ffile.git

diff --git a/file.spec b/file.spec
index 079c6f9..e7a0a0b 100644
--- a/file.spec
+++ b/file.spec
@@ -2,56 +2,58 @@
 # 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
-Summary(de.UTF-8):   Ein Befehl zur Bestimmung von Dateitypen
-Summary(es.UTF-8):   Utilidad para determinar el tipo de fichero
-Summary(fr.UTF-8):   Utilitaire permettant d'identifier des types de fichier
-Summary(id.UTF-8):   Utility untuk menentukan tipe file
-Summary(is.UTF-8):   Tól til þess að komast að tegund skráar
-Summary(it.UTF-8):   Utility per determinare il tipo di file
-Summary(ja.UTF-8):   ファイルの種類を判断するためのユーティリティ
-Summary(ko.UTF-8):   파일 종류를 결정하는 유틸리티
-Summary(nb.UTF-8):   Et verktøy for å bestemme filtyper
-Summary(pl.UTF-8):   Polecenie określające rodzaj pliku
-Summary(pt.UTF-8):   Um utilitário para determinar o tipo dos ficheiros
-Summary(pt_BR.UTF-8):   Um utilitário para determinar tipos de arquivos
-Summary(ru.UTF-8):   Утилита для определения типов файлов
-Summary(sk.UTF-8):   Pomocný program pre určenie typu súboru
-Summary(sl.UTF-8):   Pripomoček za ugotavljanje vrste datotek
-Summary(sv.UTF-8):   Ett verktyg för att bestämma filtyper
-Summary(tr.UTF-8):   Dosya türünü öğrenmek için bir araç
-Summary(uk.UTF-8):   Утиліта для визначення типів файлів
-Summary(zh_CN.UTF-8):   判定文件类型的工具。
-Summary(zh_TW.UTF-8):   用於決定檔案類型的一個工具程式。
+Summary(cs.UTF-8):	Program pro zjišťování typu souborů
+Summary(da.UTF-8):	Et værktøj til bestemmelse af filtyper
+Summary(de.UTF-8):	Ein Befehl zur Bestimmung von Dateitypen
+Summary(es.UTF-8):	Utilidad para determinar el tipo de fichero
+Summary(fr.UTF-8):	Utilitaire permettant d'identifier des types de fichier
+Summary(id.UTF-8):	Utility untuk menentukan tipe file
+Summary(is.UTF-8):	Tól til þess að komast að tegund skráar
+Summary(it.UTF-8):	Utility per determinare il tipo di file
+Summary(ja.UTF-8):	ファイルの種類を判断するためのユーティリティ
+Summary(ko.UTF-8):	파일 종류를 결정하는 유틸리티
+Summary(nb.UTF-8):	Et verktøy for å bestemme filtyper
+Summary(pl.UTF-8):	Polecenie określające rodzaj pliku
+Summary(pt.UTF-8):	Um utilitário para determinar o tipo dos ficheiros
+Summary(pt_BR.UTF-8):	Um utilitário para determinar tipos de arquivos
+Summary(ru.UTF-8):	Утилита для определения типов файлов
+Summary(sk.UTF-8):	Pomocný program pre určenie typu súboru
+Summary(sl.UTF-8):	Pripomoček za ugotavljanje vrste datotek
+Summary(sv.UTF-8):	Ett verktyg för att bestämma filtyper
+Summary(tr.UTF-8):	Dosya türünü öğrenmek için bir araç
+Summary(uk.UTF-8):	Утиліта для визначення типів файлів
+Summary(zh_CN.UTF-8):	判定文件类型的工具。
+Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	4.19
+Version:	5.15
 Release:	1
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	a61ef3aa8339d5987148089afde25f60
-Source1:	zisofs.magic
-Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-# Source2-md5:	c157a183b64156f8baafaefd9cbf04c1
-Source3:	%{name}-magic.mscompress
-Patch0:		%{name}-debian.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
-BuildRequires:	autoconf
+# Source0-md5:	3f99565532f548d7540912c4642d1ede
+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:		%{name}-sparc.patch
+Patch1:		%{name}-selinux.patch
+Patch2:		searchpath.patch
+Patch3:		automake.patch
+URL:		http://www.darwinsys.com/file/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
+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
+BuildRequires:	zlib-devel
 Requires:	libmagic = %{version}-%{release}
 Conflicts:	rpm-build < 4.4.1-9
 Conflicts:	xdelta < 1.0.0
@@ -185,7 +187,7 @@ file 指令是根據檔案包含的資料類型來辨認檔案。 File
 
 %package -n libmagic
 Summary:	libmagic library
-Summary(pl.UTF-8):   Biblioteka libmagic
+Summary(pl.UTF-8):	Biblioteka libmagic
 Group:		Libraries
 
 %description -n libmagic
@@ -196,9 +198,10 @@ Biblioteka funkcji operujących na pliku bazy danych magic.
 
 %package -n libmagic-devel
 Summary:	Header files for libmagic library
-Summary(pl.UTF-8):   Pliki nagłówkowe biblioteki libmagic
+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.
@@ -214,7 +217,7 @@ używających libmagic.
 
 %package -n libmagic-static
 Summary:	Static libmagic library
-Summary(pl.UTF-8):   Statyczna biblioteka libmagic
+Summary(pl.UTF-8):	Statyczna biblioteka libmagic
 Group:		Development/Libraries
 Requires:	libmagic-devel = %{version}-%{release}
 
@@ -230,7 +233,7 @@ Ten pakiet zawiera statyczną wersję biblioteki.
 
 %package -n python-magic
 Summary:	Python bindings for libmagic
-Summary(pl.UTF-8):   Wiązania Pythona dla libmagic
+Summary(pl.UTF-8):	Wiązania Pythona dla libmagic
 Group:		Libraries/Python
 Requires:	libmagic = %{version}-%{release}
 %pyrequires_eq	python-libs
@@ -247,9 +250,15 @@ Wiązania Pythona dla libmagic.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+%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
 %{__libtoolize}
@@ -258,17 +267,22 @@ Wiązania Pythona dla libmagic.
 %{__autoconf}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--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
 
+%if %{with tests}
+%{__make} check
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{_lib}
@@ -276,34 +290,25 @@ install -d $RPM_BUILD_ROOT/%{_lib}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_libdir}/libmagic.so.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libmagic.so.*.*) \
+mv $RPM_BUILD_ROOT%{_libdir}/libmagic.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libmagic.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libdir}/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 %{SOURCE1} %{SOURCE3} >>$RPM_BUILD_ROOT%{_datadir}/file/magic
-
-bzip2 -dc %{SOURCE2} | 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
+awk -f %{SOURCE4} < $RPM_BUILD_ROOT%{_datadir}/misc/magic > $RPM_BUILD_ROOT%{_datadir}/misc/magic.mime
+ln -s misc $RPM_BUILD_ROOT%{_datadir}/file
 
-./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
+bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__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 +316,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]/*
@@ -331,13 +350,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libmagic
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libmagic.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libmagic.so.1
 
 %files -n libmagic-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmagic.so
 %{_libdir}/libmagic.la
 %{_includedir}/magic.h
-%{_mandir}/man3/*
+%{_mandir}/man3/libmagic.3*
 
 %if %{with static_libs}
 %files -n libmagic-static
@@ -348,6 +368,9 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python}
 %files -n python-magic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.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