- disable libseccomp for now, causes "Bad system call" errors on i686

[packages/file.git] / file.spec

diff --git a/file.spec b/file.spec
index 0900c545a64257778c591fcf04e8aaed2511e3af..89a0b6ffc9b6c012d15467f5b5a396f69e6b7748 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -29,12 +29,12 @@ Summary(uk.UTF-8):  Утиліта для визначення типів фай
 Summary(zh_CN.UTF-8):  判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
-Version:       5.22
+Version:       5.33
 Release:       2
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
-# Source0-md5: 8fb13e5259fe447e02c4a37bc7225add
+# 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
@@ -43,13 +43,13 @@ Source4:    %{name}-magic.mime-gen.awk
 Patch0:                %{name}-selinux.patch
 Patch1:                searchpath.patch
 Patch2:                automake.patch
-Patch3:                %{name}-perl.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
+BuildRequires: rpmbuild(macros) >= 1.710
 %if %{with python2}
 BuildRequires: python-devel
 BuildRequires: python-modules
@@ -270,7 +270,6 @@ Wiązania Pythona 3 do biblioteki libmagic.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 %if "%{cc_version}" < "3.4"
@@ -293,6 +292,7 @@ cp -a python py3
 %{__autoconf}
 %{__automake}
 %configure \
+       --disable-libseccomp \
        --disable-silent-rules \
        --enable-fsect-man5 \
        %{?with_static_libs:--enable-static}
@@ -301,12 +301,12 @@ cp -a python py3
 
 %if %{with python2}
 cd python
-%{__python} setup.py build
+%py_build
 cd ..
 %endif
 %if %{with python3}
 cd py3
-%{__python3} setup.py build
+%py3_build
 cd ..
 %endif
 
@@ -327,19 +327,14 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libmagic.so.*.*.*) \
 
 %if %{with python2}
 cd python
-%{__python} setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT
+%py_install
 cd ..
 %py_postclean
 %endif
 
 %if %{with python3}
 cd py3
-%{__python3} setup.py install \
-       --optimize=2 \
-       --skip-build \
-       --root=$RPM_BUILD_ROOT
+%py3_install
 cd ..
 %endif
 
@@ -409,10 +404,8 @@ fi
 %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}
@@ -421,5 +414,5 @@ fi
 %doc python/README python/example.py
 %{py3_sitescriptdir}/magic.py
 %{py3_sitescriptdir}/__pycache__/magic.*.py[co]
-%{py3_sitescriptdir}/Magic_file_extensions-*.egg-info
+%{py3_sitescriptdir}/file_magic-*-py*.egg-info
 %endif