[file] detect names of RPM packages

[Jan Kaluža]

commit df874cf339100b29eb2bd71482f440e4323b8d3e
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Thu Jun 21 09:23:10 2012 +0200

    detect names of RPM packages
    
    - detect swap on ia64 architecture

 file-4.17-rpm-name.patch  |   12 ++++++++++++
 file-5.11-ia64-swap.patch |   12 ++++++++++++
 file.spec                 |   12 ++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/file-4.17-rpm-name.patch b/file-4.17-rpm-name.patch
new file mode 100644
index 0000000..bfb9242
--- /dev/null
+++ b/file-4.17-rpm-name.patch
@@ -0,0 +1,12 @@
+diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
+index 4eb5556..fe22b3d 100644
+--- a/magic/Magdir/rpm
++++ b/magic/Magdir/rpm
+@@ -28,6 +28,7 @@
+ >>8	beshort		17		SuperH
+ >>8	beshort		18		Xtensa
+ >>8	beshort		255		noarch
++>>10	string		x		%s
+ 
+ #delta RPM    Daniel Novotny (dnovotny at redhat.com)
+ 0	string	drpm	Delta RPM
diff --git a/file-5.11-ia64-swap.patch b/file-5.11-ia64-swap.patch
new file mode 100644
index 0000000..bf2fbb9
--- /dev/null
+++ b/file-5.11-ia64-swap.patch
@@ -0,0 +1,12 @@
+diff --git a/magic/Magdir/linux b/magic/Magdir/linux
+index 8d4c60a..aa8d1aa 100644
+--- a/magic/Magdir/linux
++++ b/magic/Magdir/linux
+@@ -88,6 +88,7 @@
+ # From Daniel Novotny <dnovotny at redhat.com>
+ # swap file for PowerPC
+ 65526	string		SWAPSPACE2	Linux/ppc swap file
++16374   string          SWAPSPACE2      Linux/ia64 swap file
+ #
+ # Linux kernel boot images, from Albert Cahalan <acahalan at cs.uml.edu>
+ # and others such as Axel Kohlmeyer <akohlmey at rincewind.chemie.uni-ulm.de>
diff --git a/file.spec b/file.spec
index 28696e4..f39de60 100644
--- a/file.spec
+++ b/file.spec
@@ -5,18 +5,20 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 # Upstream says it's up to distributions to add a way to support local-magic.
 Patch0: file-localmagic.patch
-# sent upstream
+# 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
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +78,8 @@ file(1) command.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -160,6 +164,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jun 21 2012 Jan Kaluza <jkaluza at redhat.com> - 5.11-2
+- detect names of RPM packages
+- detect swap on ia64 architecture
+
 * Mon Feb 27 2012 Jan Kaluza <jkaluza at redhat.com> - 5.11-1
 - fix #796130 - update to file-5.11
 - fix #796209 - recognize VDI images