[file/f21: 5/5] Update to new version 5.22

[Jan Kaluža]

commit ed2b61f9e966db44b8a48add3d0bd03d6c4d5813
Merge: d88099c f5cf01a
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Tue Feb 10 07:34:32 2015 +0100

    Update to new version 5.22

 .gitignore                     |    2 ++
 file-5.10-strength.patch       |    8 --------
 file-5.14-x86boot.patch        |   24 ++++++++++++------------
 file-5.19-CVE-2014-3587.patch  |   36 ------------------------------------
 file-5.19-locale-archive.patch |   11 -----------
 file-5.19-msooxml.patch        |   22 ----------------------
 file-5.19-pascal.patch         |   29 -----------------------------
 file-5.19-python-3.4.patch     |   24 ------------------------
 file.spec                      |   19 ++++++-------------
 sources                        |    2 +-
 10 files changed, 21 insertions(+), 156 deletions(-)
---
diff --cc file.spec
index dadcdbf,b28399a..27441b5
--- a/file.spec
+++ b/file.spec
@@@ -18,13 -18,7 +18,8 @@@ Patch5: file-5.04-man-return-code.patc
  Patch6: file-5.04-generic-msdos.patch
  Patch7: file-5.14-x86boot.patch
  Patch8: file-5.14-perl.patch
- Patch9: file-5.19-CVE-2014-3587.patch
- Patch10: file-5.19-pascal.patch
- Patch11: file-5.19-locale-archive.patch
- Patch12: file-5.19-msooxml.patch
- Patch13: file-5.19-python-3.4.patch
  Patch14: file-5.19-cafebabe.patch
- Patch15: file-5.20-CVE-2014-3710.patch
++Patch15: file-5.22-awk-perl.patch
  URL: http://www.darwinsys.com/file/
  Requires: file-libs = %{version}-%{release}
  BuildRequires: zlib-devel
@@@ -93,13 -87,7 +88,8 @@@ file(1) command
  %patch6 -p1
  %patch7 -p1
  %patch8 -p1
- %patch9 -p1
- %patch10 -p1
- %patch11 -p1
- %patch12 -p1
- %patch13 -p1
  %patch14 -p1
 +%patch15 -p1
  
  # Patches can generate *.orig files, which can't stay in the magic dir,
  # otherwise there will be problems with compiling magic file!
@@@ -208,8 -196,14 +198,11 @@@ cd %{py3dir
  %endif
  
  %changelog
+ * Wed Feb 04 2015 Jan Kaluza <jkaluza at redhat.com> - 5.22-1
+ - update to new version 5.22
+ 
 -* Thu Oct 23 2014 Jan Kaluza <jkaluza at redhat.com> - 5.20-2
 -- fix CVE-2014-3710 (#1155464)
 -
 -* Thu Oct 16 2014 Jan Kaluza <jkaluza at redhat.com> - 5.20-1
 -- update to new version 5.20
 +* Thu Oct 23 2014 Jan Kaluza <jkaluza at redhat.com> - 5.19-7
 +- fix #1155464 - fix for CVE-2014-3710
  
  * Wed Sep 03 2014 Jan Kaluza <jkaluza at redhat.com> - 5.19-6
  - fix #1134580 - detect Mach-O universal binary