Browse Source

file-5.28-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10739 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 7 years ago
parent
commit
8303d8a5ba
1 changed files with 25 additions and 10 deletions
  1. 25 10
      f/file/file-vl.spec

+ 25 - 10
f/file/file-vl.spec

@@ -5,7 +5,7 @@
 Summary: A utility for determining file types.
 Summary(ja): ファイルの種類を判別するユーティリティー
 Name: file
-Version: 5.20
+Version: 5.28
 Release: 1%{?_dist_release}
 License: BSD
 Group: Applications/System
@@ -18,7 +18,7 @@ Source10: magic.printer-j
 
 # Upstream says it's up to distributions to add a way to support local-magic.
 Patch0: file-localmagic.patch
-# sent upstream - should be included in next upstream release
+# sent upstream
 Patch1: file-5.10-strength.patch
 Patch3: file-4.17-rpm-name.patch
 Patch4: file-5.04-volume_key.patch
@@ -27,12 +27,17 @@ Patch6: file-5.04-generic-msdos.patch
 Patch7: file-5.14-x86boot.patch
 Patch8: file-5.14-perl.patch
 Patch14: file-5.19-cafebabe.patch
+Patch15: file-5.22-awk-perl.patch
+Patch17: file-5.24-varied.patch
 
-#Vine
-Patch100: file-5.14-magicbuild-fix.patch
+# https://github.com/file/file/pull/8
+Patch100: file-5.28-compress-sigsegv.patch
 
-#Security
-Patch200: file-5.20-CVE-2014-3710.patch
+# Vine
+Patch1000: file-5.14-magicbuild-fix.patch
+
+# Security
+#  none
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: automake
@@ -72,7 +77,7 @@ necessary for developing programs using libmagic.
 %package -n python-magic
 Summary: Python bindings for the libmagic API
 Group:   Development/Libraries
-BuildRequires: python-devel
+BuildRequires: python-devel python-setuptools
 Requires: %{name} = %{version}-%{release}
 
 %description -n python-magic
@@ -93,12 +98,16 @@ file(1) command.
 %patch7 -p1
 %patch8 -p1
 %patch14 -p1
+%patch15 -p1
+%patch17 -p1
 
-#Vine
 %patch100 -p1
 
-#Security
-%patch200 -p1 -b .CVE-2014-3587
+# Vine
+%patch1000 -p1
+
+# Security
+#  none
 
 cat %{SOURCE10} >> ./magic/Localstuff
 
@@ -188,6 +197,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 28 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.28-1
+- new upstream release.
+- dropped Patch200: fixed in upstream.
+- updated patches.
+- imported Patch15,17 and 100.
+
 * Sat Nov 15 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.20-1
 - new upstream release
 - update/drop patches based on fc22