From d7a20635e89091739567e67d5ff5b137aaf556f1 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 8 Apr 2013 17:13:56 -0400
Subject: [PATCH] update to 1.2

---
 binwalk-1.2-ignore-matplotlib-fail.patch | 21 ++++++++++++++
 binwalk.spec                             | 36 ++++++++++++------------
 sources                                  |  2 +-
 3 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 binwalk-1.2-ignore-matplotlib-fail.patch

diff --git a/binwalk-1.2-ignore-matplotlib-fail.patch b/binwalk-1.2-ignore-matplotlib-fail.patch
new file mode 100644
index 0000000..87900b8
--- /dev/null
+++ b/binwalk-1.2-ignore-matplotlib-fail.patch
@@ -0,0 +1,21 @@
+diff -up binwalk-1.2/src/setup.py.ignore-matplotlibfail binwalk-1.2/src/setup.py
+--- binwalk-1.2/src/setup.py.ignore-matplotlibfail	2013-04-08 16:47:13.975048629 -0400
++++ binwalk-1.2/src/setup.py	2013-04-08 16:47:36.047047840 -0400
+@@ -30,12 +30,12 @@ try:
+ except Exception, e:
+ 	print "\n", "*" * WIDTH
+ 	print "Pre-requisite check warning:", str(e)
+-	print "To take advantage of this tool's entropy plotting capabilities, please install the python-matplotlib module."
+-	print "*" * WIDTH, "\n"
++	# print "To take advantage of this tool's entropy plotting capabilities, please install the python-matplotlib module."
++	# print "*" * WIDTH, "\n"
+ 	
+-	if raw_input('Continue installation without this module (Y/n)? ').lower().startswith('n'):
+-		print 'Quitting...\n'
+-		sys.exit(1)
++	# if raw_input('Continue installation without this module (Y/n)? ').lower().startswith('n'):
++	# 	print 'Quitting...\n'
++	#	sys.exit(1)
+ 		
+ 
+ # Generate a new magic file from the files in the magic directory
diff --git a/binwalk.spec b/binwalk.spec
index a091d34..ac0f396 100644
--- a/binwalk.spec
+++ b/binwalk.spec
@@ -1,45 +1,45 @@
 Name:           binwalk
-Version:	0.4.5
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Firmware analysis tool
-
-License:	MIT
+License:        MIT
 URL:            http://code.google.com/p/binwalk/
-Source0:	http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
-
-BuildRequires:  file-devel
-BuildRequires:  libcurl-devel
-BuildRequires:	zlib-devel
+Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0:         binwalk-1.2-ignore-matplotlib-fail.patch
+BuildArch:      noarch
+BuildRequires:  python-magic, python-matplotlib
+Requires:       python-matplotlib, python-magic
 
 %description
 Binwalk is a tool for searching a given binary image for embedded files and
 executable code. Specifically, it is designed for identifying files and code
-embedded inside of firmware images. Binwalk uses the libmagic library, so it is
-compatible with magic signatures created for the Unix file utility. 
+embedded inside of firmware images. Binwalk uses the python-magic library, so 
+it is compatible with magic signatures created for the Unix file utility. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .ignore-matplotlib-fail
 
 %build
 pushd src
-# binwalk wants to install its file magic to /etc, but it's really more like
-# static data than like a config file.
-%configure --sysconfdir=%{_datadir}
-make %{?_smp_mflags}
+%{__python} setup.py build
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
 pushd src
-%make_install
+%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
 popd
 
 %files
 %doc docs/*
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{python_sitelib}/%{name}/
+%{python_sitelib}/%{name}-%{version}*.egg-info
 
 %changelog
+* Mon Apr  8 2013 Tom Callaway <spot@fedoraproject.org> 1.2-1
+- update to 1.2
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 51a7c07..69640c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61aede5a7ab9bd54ebd93b7086f57bc0  binwalk-0.4.5.tar.gz
+8a6990dcb26c3f94d72490bca563cf83  binwalk-1.2.tar.gz