From 1c54f5a15e3a2c758e92906e9eba6b9ab48affb0 Mon Sep 17 00:00:00 2001
From: "Nathaniel P. McCallum" <npmccallum@redhat.com>
Date: Wed, 10 Sep 2014 16:43:02 -0400
Subject: [PATCH] Update to 5.0.1

---
 .gitignore         |  1 +
 python-qrcode.spec | 25 +++++++++++++++++++++----
 sources            |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c9fb94..5506f3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qrcode-2.4.1.tar.gz
+/qrcode-5.0.1.tar.gz
diff --git a/python-qrcode.spec b/python-qrcode.spec
index 4f3df79..834d259 100644
--- a/python-qrcode.spec
+++ b/python-qrcode.spec
@@ -1,8 +1,8 @@
 %global pkgname qrcode
 
 Name:           python-%{pkgname}
-Version:        2.4.1
-Release:        7%{?dist}
+Version:        5.0.1
+Release:        1%{?dist}
 Summary:        Python QR Code image generator
 
 License:        BSD
@@ -11,7 +11,9 @@ Source0:        http://pypi.python.org/packages/source/q/qrcode/qrcode-%{version
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 BuildRequires:  python-imaging
+BuildRequires:  python-six
 Requires:       python-imaging
 Requires:       %{name}-core = %{version}-%{release}
 
@@ -21,7 +23,8 @@ generation of QR Codes.
 
 
 %package core
-Summary: Python QR Code image generator (core library)
+Requires:       python-six
+Summary:        Python QR Code image generator (core library)
 
 %description core
 Core Python module for QR code generation. Does not contain image rendering.
@@ -30,6 +33,9 @@ Core Python module for QR code generation. Does not contain image rendering.
 %prep
 %setup -q -n %{pkgname}-%{version}
 
+# The pure plugin requires pymaging which is not packaged in Fedora.
+rm qrcode/image/pure.py*
+
 
 %build
 %{__python} setup.py build
@@ -37,8 +43,14 @@ Core Python module for QR code generation. Does not contain image rendering.
 
 %install
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__mv} %{buildroot}%{_bindir}/qr{,code}
 
+#
+# In previous iterations of the package, the qr script had been
+# renamed to qrcode. This was an unnecessary change from upstream.
+#
+# We cary this symlink to maintain compat with old packages.
+#
+ln -s qr %{buildroot}%{_bindir}/qrcode
 
 %check
 # in lieue of a real test suite
@@ -53,7 +65,9 @@ done
 
 
 %files
+%{_bindir}/qr
 %{_bindir}/qrcode
+%{_mandir}/man1/qr.1*
 %{python_sitelib}/%{pkgname}/image/svg.py*
 %{python_sitelib}/%{pkgname}/image/pil.py*
 
@@ -69,6 +83,9 @@ done
 
 
 %changelog
+* Wed Sep 10 2014 Nathaniel McCallum <npmccallum@redhat.com> - 5.0.1-1
+- Update to 5.0.1
+
 * Tue Sep 09 2014 Nathaniel McCallum <npmccallum@redhat.com> - 2.4.1-7
 - Create -core subpackage for minimal dependencies
 
diff --git a/sources b/sources
index 5951295..c3c6122 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23cc19394010c74d226b6ab8797957ac  qrcode-2.4.1.tar.gz
+bef9cccd638888724cd2ae31860875b5  qrcode-5.0.1.tar.gz