Browse Source

file: update to 5.11

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7177 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
8b3cb214f4
1 changed files with 28 additions and 16 deletions
  1. 28 16
      f/file/file-vl.spec

+ 28 - 16
f/file/file-vl.spec

@@ -5,8 +5,8 @@
 Summary: A utility for determining file types.
 Summary(ja): ファイルの種類を判別するユーティリティー
 Name: file
-Version: 5.05
-Release: 3%{?_dist_release}
+Version: 5.11
+Release: 1%{?_dist_release}
 
 License: BSD
 Group: Applications/System
@@ -16,13 +16,18 @@ Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
 # Addtional magic file for Vine
 Source10: magic.printer-j
 
-Patch1: file-5.04-zip64.patch
-Patch2: file-5.05-python-magic.patch
-Patch3: file-5.05-images-magic.patch
-
-# Vine patch
-Patch100: file-5.05-jtext.patch
-Patch120: file-5.05-vinenames.patch
+# 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
+Patch1: file-tnef.patch
+Patch2: file-5.10-strength.patch
+Patch3: file-5.10-sticky-bit.patch
+Patch4: file-python-func.patch
+Patch5: file-qed-vdi-image.patch
+Patch6: file-5.11-ia64-swap.patch
+Patch7: file-4.17-rpm-name.patch
+Patch8: file-5.11-magicmgc-home.patch
+Patch9: file-5.11-compress.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: automake
@@ -31,6 +36,7 @@ BuildRequires: zlib-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description
 The file command is used to identify a particular file according to the
@@ -83,15 +89,16 @@ file(1) command.
 %prep
 %setup -q
 
-#fixes #637785
+%patch0 -p1
 %patch1 -p1
-#keeps compatibility with older python-magic versions
 %patch2 -p1
-%patch3 -p1 
-
-# Patch100 working now
-#patch100 -p1 -b .vinejtext
-%patch120 -p1 -b .vinenames
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 cat %{SOURCE10} >> ./magic/Localstuff
 
@@ -185,6 +192,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 5.11-1
+- new upstream reelase
+- drop all local patches
+- import fedora patches
+
 * Wed Feb 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.05-3
 - rebuild with python-2.7.2