- fix problems with virtualbox data files.

  http://mx.gw.com/pipermail/file/2012/000907.html

Changed files:
    file-revert-weak-palm-magic.patch -> 1.1
    file.spec -> 1.192

diff --git a/file-revert-weak-palm-magic.patch b/file-revert-weak-palm-magic.patch
new file mode 100644 (file)
index 0000000..a3a1bd0
--- /dev/null
+++ b/file-revert-weak-palm-magic.patch
@@ -0,0 +1,29 @@
+--- file/magic/Magdir/palm     15 Dec 2011 16:21:43 -0000      1.8
++++ file/magic/Magdir/palm     16 Jan 2012 15:16:36 -0000
+@@ -10,17 +10,17 @@
+ # What are the possibilities and where is this documented?
+ 
+ # appl
+-59    byte                    \0
+->60   string                  appl            PalmOS application
+->0    string                  >\0             "%s"
++#59   byte                    \0
++#>60  string                  appl            PalmOS application
++#>0   string                  >\0             "%s"
+ # TEXt
+-59    byte                    \0
+->60   belong                  TEXt            AportisDoc file
+->0    string                  >\0             "%s"
++#59   byte                    \0
++#>60  belong                  TEXt            AportisDoc file
++#>0   string                  >\0             "%s"
+ # HACK
+-59    byte                    \0
+->60   string                  HACK            HackMaster hack
+->0    string                  >\0             "%s"
++#59   byte                    \0
++#>60  string                  HACK            HackMaster hack
++#>0   string                  >\0             "%s"
+ 
+ # Variety of PalmOS document types
+ # Michael-John Turner <mj at debian.org>

diff --git a/file.spec b/file.spec
index cf6fc8c51cf51327e6e0d85d5e88790de1f190e8..726023e8c065dff3459ed7e6f461877f81b818f4 100644 (file)
--- a/file.spec
+++ b/file.spec
@@ -29,7 +29,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
 Version:       5.10
 Summary(zh_TW.UTF-8):  用於決定檔案類型的一個工具程式。
 Name:          file
 Version:       5.10

-Release:       1
+Release:       2

 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
 License:       distributable
 Group:         Applications/File
 Source0:       ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz


@@ -44,6 +44,7 @@ Patch1:               %{name}-sparc.patch
 Patch2:                %{name}-selinux.patch
 Patch3:                searchpath.patch
 Patch4:                automake.patch
 Patch2:                %{name}-selinux.patch
 Patch3:                searchpath.patch
 Patch4:                automake.patch

+Patch5:                %{name}-revert-weak-palm-magic.patch

 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 URL:           http://www.darwinsys.com/file/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake


@@ -250,6 +251,7 @@ Wiązania Pythona dla libmagic.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+%patch5 -p1

 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e 's,-Wextra,,' configure.ac