X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=file.spec;h=89a0b6ffc9b6c012d15467f5b5a396f69e6b7748;hb=cfd17b6b8c1d0a00cfe8ab49f1068d36b3d49d0a;hp=2a8a6809e5fd72a2613097854c56c8137b7fe618;hpb=547c006efbb89bbcf213a55f851f35dd11b4ee0e;p=packages%2Ffile.git

diff --git a/file.spec b/file.spec
index 2a8a680..89a0b6f 100644
--- a/file.spec
+++ b/file.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_without	python		# don't build python-magic module
+%bcond_without	python2		# don't build python-magic module for Python 2.x
+%bcond_without	python3		# don't build python-magic module for Python 3.x
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	tests		# don't perform "make check"
 
@@ -28,32 +29,39 @@ Summary(uk.UTF-8):	Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):	判定文件类型的工具。
 Summary(zh_TW.UTF-8):	用於決定檔案類型的一個工具程式。
 Name:		file
-Version:	5.18
-Release:	1
+Version:	5.33
+Release:	2
 License:	distributable
 Group:		Applications/File
 Source0:	ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5:	d420d8f2990cd344673acfbf8d76ff5a
+# Source0-md5:	bbe6db96e3a9ca9554dce647390540ef
 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
+Patch0:		%{name}-selinux.patch
+Patch1:		searchpath.patch
+Patch2:		automake.patch
+Patch4:		name-use-count.patch
 URL:		http://www.darwinsys.com/file/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	libseccomp-devel
 BuildRequires:	libtool >= 2:2.0
-BuildRequires:	rpmbuild(macros) >= 1.453
-%if %{with python}
+BuildRequires:	rpmbuild(macros) >= 1.710
+%if %{with python2}
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
 %endif
+%if %{with python3}
+BuildRequires:	python3-devel
+BuildRequires:	python3-modules
+BuildRequires:	rpm-pythonprov
+%endif
 BuildRequires:	zlib-devel
+Requires(pretrans):	coreutils
 Requires:	libmagic = %{version}-%{release}
 Conflicts:	rpm-build < 4.4.1-9
 Conflicts:	xdelta < 1.0.0
@@ -232,24 +240,37 @@ Biblioteka funkcji operujących na pliku bazy danych magic.
 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:	Python 2 bindings for libmagic
+Summary(pl.UTF-8):	Wiązania Pythona 2 do biblioteki libmagic
 Group:		Libraries/Python
 Requires:	libmagic = %{version}-%{release}
-%pyrequires_eq	python-libs
+Requires:	python-libs
 
 %description -n python-magic
-Python bindings for libmagic.
+Python 2 bindings for libmagic.
 
 %description -n python-magic -l pl.UTF-8
-Wiązania Pythona dla libmagic.
+Wiązania Pythona 2 do biblioteki libmagic.
+
+%package -n python3-magic
+Summary:	Python 3 bindings for libmagic
+Summary(pl.UTF-8):	Wiązania Pythona 3 do biblioteki libmagic
+Group:		Libraries/Python
+Requires:	libmagic = %{version}-%{release}
+Requires:	python-libs
+
+%description -n python3-magic
+Python 3 bindings for libmagic.
+
+%description -n python3-magic -l pl.UTF-8
+Wiązania Pythona 3 do biblioteki libmagic.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+%patch4 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
@@ -260,6 +281,10 @@ cp -p %{SOURCE2} magic/Magdir/zisofs
 
 rm -f magic/Magdir/{*.orig,*~}
 
+%if %{with python3}
+cp -a python py3
+%endif
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -267,15 +292,21 @@ rm -f magic/Magdir/{*.orig,*~}
 %{__autoconf}
 %{__automake}
 %configure \
+	--disable-libseccomp \
 	--disable-silent-rules \
 	--enable-fsect-man5 \
 	%{?with_static_libs:--enable-static}
 
 %{__make}
 
-%if %{with python}
+%if %{with python2}
 cd python
-%{__python} setup.py build
+%py_build
+cd ..
+%endif
+%if %{with python3}
+cd py3
+%py3_build
 cd ..
 %endif
 
@@ -294,15 +325,19 @@ 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}
+%if %{with python2}
 cd python
-%{__python} setup.py install \
-	--root=$RPM_BUILD_ROOT \
-	--optimize=2
+%py_install
 cd ..
 %py_postclean
 %endif
 
+%if %{with python3}
+cd py3
+%py3_install
+cd ..
+%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
 
@@ -365,12 +400,19 @@ fi
 %{_libdir}/libmagic.a
 %endif
 
-%if %{with python}
+%if %{with python3}
 %files -n python-magic
 %defattr(644,root,root,755)
 %doc python/README python/example.py
-%if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/Magic_file_extensions-*.egg-info
-%endif
 %{py_sitescriptdir}/magic.py[co]
+%{py_sitescriptdir}/file_magic-*-py*.egg-info
+%endif
+
+%if %{with_python3}
+%files -n python3-magic
+%defattr(644,root,root,755)
+%doc python/README python/example.py
+%{py3_sitescriptdir}/magic.py
+%{py3_sitescriptdir}/__pycache__/magic.*.py[co]
+%{py3_sitescriptdir}/file_magic-*-py*.egg-info
 %endif