diff --git a/chirp-0.1.12-shebang.patch b/chirp-0.1.12-shebang.patch
deleted file mode 100644
index 8fa7ed0..0000000
--- a/chirp-0.1.12-shebang.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-diff -up ./chirp/bitwise_grammar.py.orig ./chirp/bitwise_grammar.py
---- ./chirp/bitwise_grammar.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/bitwise_grammar.py	2011-11-20 18:46:00.750416304 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/bitwise.py.orig ./chirp/bitwise.py
---- ./chirp/bitwise.py.orig	2011-08-17 07:00:16.000000000 -0400
-+++ ./chirp/bitwise.py	2011-11-20 18:45:23.559707419 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/chirp_common.py.orig ./chirp/chirp_common.py
---- ./chirp/chirp_common.py.orig	2011-08-19 07:00:12.000000000 -0400
-+++ ./chirp/chirp_common.py	2011-11-20 18:46:28.110465261 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/csv.py.orig ./chirp/csv.py
---- ./chirp/csv.py.orig	2011-08-26 07:00:10.000000000 -0400
-+++ ./chirp/csv.py	2011-11-20 18:47:02.450271560 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/errors.py.orig ./chirp/errors.py
---- ./chirp/errors.py.orig	2011-08-29 07:00:12.000000000 -0400
-+++ ./chirp/errors.py	2011-11-20 18:48:36.541000615 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ft2800.py.orig ./chirp/ft2800.py
---- ./chirp/ft2800.py.orig	2011-09-01 07:00:10.000000000 -0400
-+++ ./chirp/ft2800.py	2011-11-20 18:54:35.839507259 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ft50_ll.py.orig ./chirp/ft50_ll.py
---- ./chirp/ft50_ll.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/ft50_ll.py	2011-11-20 18:53:28.672843074 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ft50.py.orig ./chirp/ft50.py
---- ./chirp/ft50.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/ft50.py	2011-11-20 18:52:59.224867119 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ft60.py.orig ./chirp/ft60.py
---- ./chirp/ft60.py.orig	2011-08-27 07:00:13.000000000 -0400
-+++ ./chirp/ft60.py	2011-11-20 18:54:04.144609512 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ft7800.py.orig ./chirp/ft7800.py
---- ./chirp/ft7800.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/ft7800.py	2011-11-20 19:26:02.293946975 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic2100.py.orig ./chirp/ic2100.py
---- ./chirp/ic2100.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/ic2100.py	2011-11-20 18:57:41.282057488 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic2200.py.orig ./chirp/ic2200.py
---- ./chirp/ic2200.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/ic2200.py	2011-11-20 18:58:18.511762496 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic2720.py.orig ./chirp/ic2720.py
---- ./chirp/ic2720.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/ic2720.py	2011-11-20 18:58:42.025944555 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic2820.py.orig ./chirp/ic2820.py
---- ./chirp/ic2820.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/ic2820.py	2011-11-20 18:59:11.277927008 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic9x_icf_ll.py.orig ./chirp/ic9x_icf_ll.py
---- ./chirp/ic9x_icf_ll.py.orig	2011-08-17 07:00:16.000000000 -0400
-+++ ./chirp/ic9x_icf_ll.py	2011-11-20 18:56:41.827125473 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic9x_icf.py.orig ./chirp/ic9x_icf.py
---- ./chirp/ic9x_icf.py.orig	2011-08-20 07:00:10.000000000 -0400
-+++ ./chirp/ic9x_icf.py	2011-11-20 18:55:47.800004571 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic9x_ll.py.orig ./chirp/ic9x_ll.py
---- ./chirp/ic9x_ll.py.orig	2011-05-27 07:00:12.000000000 -0400
-+++ ./chirp/ic9x_ll.py	2011-11-20 18:57:13.477024627 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/ic9x.py.orig ./chirp/ic9x.py
---- ./chirp/ic9x.py.orig	2011-08-18 07:00:11.000000000 -0400
-+++ ./chirp/ic9x.py	2011-11-20 18:55:19.099002772 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/icf.py.orig ./chirp/icf.py
---- ./chirp/icf.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/icf.py	2011-11-20 18:59:34.132131991 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/icw32.py.orig ./chirp/icw32.py
---- ./chirp/icw32.py.orig	2011-08-27 07:00:13.000000000 -0400
-+++ ./chirp/icw32.py	2011-11-20 19:01:01.796090357 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/icx8x_ll.py.orig ./chirp/icx8x_ll.py
---- ./chirp/icx8x_ll.py.orig	2011-06-09 07:00:12.000000000 -0400
-+++ ./chirp/icx8x_ll.py	2011-11-20 19:02:02.924970034 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/icx8x.py.orig ./chirp/icx8x.py
---- ./chirp/icx8x.py.orig	2011-06-09 07:00:12.000000000 -0400
-+++ ./chirp/icx8x.py	2011-11-20 19:01:29.096143449 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/id800.py.orig ./chirp/id800.py
---- ./chirp/id800.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/id800.py	2011-11-20 19:02:33.861896874 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/id880.py.orig ./chirp/id880.py
---- ./chirp/id880.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/id880.py	2011-11-20 19:03:02.587900366 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/idrp.py.orig ./chirp/idrp.py
---- ./chirp/idrp.py.orig	2011-08-19 07:00:12.000000000 -0400
-+++ ./chirp/idrp.py	2011-11-20 19:03:53.110147636 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/import_logic.py.orig ./chirp/import_logic.py
---- ./chirp/import_logic.py.orig	2011-08-17 07:00:16.000000000 -0400
-+++ ./chirp/import_logic.py	2011-11-20 19:04:14.711398200 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/__init__.py.orig ./chirp/__init__.py
---- ./chirp/__init__.py.orig	2011-09-13 18:35:50.000000000 -0400
-+++ ./chirp/__init__.py	2011-11-20 19:22:09.001072389 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/kenwood_live.py.orig ./chirp/kenwood_live.py
---- ./chirp/kenwood_live.py.orig	2011-08-23 07:00:12.000000000 -0400
-+++ ./chirp/kenwood_live.py	2011-11-20 19:05:10.143474923 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/memmap.py.orig ./chirp/memmap.py
---- ./chirp/memmap.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/memmap.py	2011-11-20 19:06:17.105151403 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/platform.py.orig ./chirp/platform.py
---- ./chirp/platform.py.orig	2011-07-26 07:00:10.000000000 -0400
-+++ ./chirp/platform.py	2011-11-20 19:06:56.395787945 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/thd72.py.orig ./chirp/thd72.py
---- ./chirp/thd72.py.orig	2011-06-09 07:00:12.000000000 -0400
-+++ ./chirp/thd72.py	2011-11-20 19:08:26.203671154 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- # ex: set tabstop=4 expandtab shiftwidth=4 softtabstop=4:
- #
- # Copyright 2010 Vernon Mauery <vernon@mauery.org>
-diff -up ./chirp/tmv71_ll.py.orig ./chirp/tmv71_ll.py
---- ./chirp/tmv71_ll.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/tmv71_ll.py	2011-11-20 19:09:07.989220848 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/tmv71.py.orig ./chirp/tmv71.py
---- ./chirp/tmv71.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/tmv71.py	2011-11-20 19:08:46.991949639 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/bankedit.py.orig ./chirpui/bankedit.py
---- ./chirpui/bankedit.py.orig	2011-04-23 19:43:35.000000000 -0400
-+++ ./chirpui/bankedit.py	2011-11-20 19:13:42.099704892 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/cloneprog.py.orig ./chirpui/cloneprog.py
---- ./chirpui/cloneprog.py.orig	2011-04-23 19:43:35.000000000 -0400
-+++ ./chirpui/cloneprog.py	2011-11-20 19:14:24.743224178 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/clone.py.orig ./chirpui/clone.py
---- ./chirpui/clone.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirpui/clone.py	2011-11-20 19:14:03.328967758 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/common.py.orig ./chirpui/common.py
---- ./chirpui/common.py.orig	2011-08-26 07:00:10.000000000 -0400
-+++ ./chirpui/common.py	2011-11-20 19:14:47.623429676 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/config.py.orig ./chirpui/config.py
---- ./chirpui/config.py.orig	2011-05-20 07:00:12.000000000 -0400
-+++ ./chirpui/config.py	2011-11-20 19:15:19.835311096 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/dstaredit.py.orig ./chirpui/dstaredit.py
---- ./chirpui/dstaredit.py.orig	2011-04-23 19:43:35.000000000 -0400
-+++ ./chirpui/dstaredit.py	2011-11-20 19:15:37.635692945 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/editorset.py.orig ./chirpui/editorset.py
---- ./chirpui/editorset.py.orig	2011-08-26 07:00:10.000000000 -0400
-+++ ./chirpui/editorset.py	2011-11-20 19:15:57.499003140 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/importdialog.py.orig ./chirpui/importdialog.py
---- ./chirpui/importdialog.py.orig	2011-08-17 07:00:16.000000000 -0400
-+++ ./chirpui/importdialog.py	2011-11-20 19:16:26.467997084 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/__init__.py.orig ./chirpui/__init__.py
---- ./chirpui/__init__.py.orig	2011-04-23 19:43:35.000000000 -0400
-+++ ./chirpui/__init__.py	2011-11-20 19:16:52.749084344 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/inputdialog.py.orig ./chirpui/inputdialog.py
---- ./chirpui/inputdialog.py.orig	2011-04-23 19:43:35.000000000 -0400
-+++ ./chirpui/inputdialog.py	2011-11-20 19:17:16.914244083 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/mainapp.py.orig ./chirpui/mainapp.py
---- ./chirpui/mainapp.py.orig	2011-09-01 07:00:10.000000000 -0400
-+++ ./chirpui/mainapp.py	2011-11-20 19:17:44.679277260 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/memedit.py.orig ./chirpui/memedit.py
---- ./chirpui/memedit.py.orig	2011-08-26 07:00:10.000000000 -0400
-+++ ./chirpui/memedit.py	2011-11-20 19:18:07.250491284 -0500
-@@ -1,4 +1,3 @@
--#/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/reporting.py.orig ./chirpui/reporting.py
---- ./chirpui/reporting.py.orig	2011-04-30 07:00:14.000000000 -0400
-+++ ./chirpui/reporting.py	2011-11-20 19:18:35.586504550 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirpui/shiftdialog.py.orig ./chirpui/shiftdialog.py
---- ./chirpui/shiftdialog.py.orig	2011-08-18 07:00:11.000000000 -0400
-+++ ./chirpui/shiftdialog.py	2011-11-20 19:18:53.815869746 -0500
-@@ -1,4 +1,3 @@
--#/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/util.py.orig ./chirp/util.py
---- ./chirp/util.py.orig	2011-04-23 19:43:34.000000000 -0400
-+++ ./chirp/util.py	2011-11-20 19:09:46.657878649 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/vx3.py.orig ./chirp/vx3.py
---- ./chirp/vx3.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/vx3.py	2011-11-20 19:10:06.163201588 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Rick Farina <sidhayn@gmail.com>
- #     based on modification of Dan Smith's original work
-diff -up ./chirp/vx5.py.orig ./chirp/vx5.py
---- ./chirp/vx5.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/vx5.py	2011-11-20 19:10:23.401603200 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/vx6.py.orig ./chirp/vx6.py
---- ./chirp/vx6.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/vx6.py	2011-11-20 19:10:47.206776838 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/vx7.py.orig ./chirp/vx7.py
---- ./chirp/vx7.py.orig	2011-08-10 07:00:09.000000000 -0400
-+++ ./chirp/vx7.py	2011-11-20 19:11:10.487968643 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/vx8.py.orig ./chirp/vx8.py
---- ./chirp/vx8.py.orig	2011-08-18 07:00:11.000000000 -0400
-+++ ./chirp/vx8.py	2011-11-20 19:11:35.252108939 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/wouxun.py.orig ./chirp/wouxun.py
---- ./chirp/wouxun.py.orig	2011-09-09 07:00:13.000000000 -0400
-+++ ./chirp/wouxun.py	2011-11-20 19:11:52.006527281 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2011 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/xml_ll.py.orig ./chirp/xml_ll.py
---- ./chirp/xml_ll.py.orig	2011-06-29 07:00:09.000000000 -0400
-+++ ./chirp/xml_ll.py	2011-11-20 19:12:45.624665751 -0500
-@@ -1,5 +1,3 @@
--#!/usr/bin/python
--#
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
- # This program is free software: you can redistribute it and/or modify
-diff -up ./chirp/xml.py.orig ./chirp/xml.py
---- ./chirp/xml.py.orig	2011-08-16 07:00:09.000000000 -0400
-+++ ./chirp/xml.py	2011-11-20 19:12:14.080760920 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2008 Dan Smith <dsmith@danplanet.com>
- #
-diff -up ./chirp/yaesu_clone.py.orig ./chirp/yaesu_clone.py
---- ./chirp/yaesu_clone.py.orig	2011-04-23 19:43:35.000000000 -0400
-+++ ./chirp/yaesu_clone.py	2011-11-20 19:13:03.457046610 -0500
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- #
- # Copyright 2010 Dan Smith <dsmith@danplanet.com>
- #
diff --git a/chirp-COPYING-setup.py.patch b/chirp-COPYING-setup.py.patch
deleted file mode 100644
index c174824..0000000
--- a/chirp-COPYING-setup.py.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./setup.py.orig ./setup.py
---- ./setup.py.orig	2011-08-25 07:00:10.000000000 -0400
-+++ ./setup.py	2011-11-19 08:47:42.630825891 -0500
-@@ -90,7 +90,7 @@ def default_build():
-         data_files=[('/usr/share/applications', desktop_files),
-                     ('/usr/share/chirp/images', image_files),
-                     ('/usr/share/chirp', xsd_files),
--                    ('/usr/share/doc/chirp', ['COPYING']),
-+                    ('/usr/share/doc/chirp-0.1.12', ['COPYING']),
- 		    ('/usr/share/pixmaps', ['share/chirp.png']),
-                     ('/usr/share/man/man1', ["share/chirpw.1"]),
-                     ] + locale_files)
diff --git a/chirp.spec b/chirp.spec
index 38c1fbd..7814f50 100644
--- a/chirp.spec
+++ b/chirp.spec
@@ -1,24 +1,17 @@
 Name:           chirp
-Version:        0.1.12
-Release:        6%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        A tool for programming two-way radio equipment
 
 Group:          Applications/Communications
 License:        GPLv3+
 URL:            http://chirp.danplanet.com/
-Source0:        http://chirp.danplanet.com/download/0.1.12/%{name}-%{version}.tar.gz
+Source0:        http://chirp.danplanet.com/download/%{version}/%{name}-%{version}.tar.gz
 # Installing correct .desktop file
 # Source:http://dp67.fedorapeople.org/pkgs/DESKTOP/chirp.desktop
 Source1:        %{name}.desktop
-# COPYING file likes to live in a peculiar place. Moving it to the proper docs directory.
-# Patch Source: http://dp67.fedorapeople.org/pkgs/PATCHES/chirp-COPYING-setup.py.patch
-Patch0:         chirp-COPYING-setup.py.patch
-# #!/usr/bin/python shebang in every file adds noise to rpmlint.. fixing
-# Patch Source: http://dp67.fedorapeople.org/pkgs/PATCHES/chirp-0.1.12-shebang.patch
-Patch1:         chirp-0.1.12-shebang.patch
 
-# BuildRoot tag left in for potential EPEL Packaging.
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         chirp-0.2.0-install.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -31,52 +24,39 @@ It provides a generic user interface to the programming
 data and process that can drive many radio models under
 the hood.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b chirp-COPYING-setup.py.patch
-%patch1 -p1 -b chirp-0.1.12-shebang.patch
+%patch0 -p1 -b .inst
+
 
 %build
 %{__python} setup.py build
 
+
 %install
-# rm -rf $RPM_BUILD_ROOT tag left in for potential EPEL Packaging.
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
 
 # Wrong .desktop config lets install the correct .desktop
 desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
-# Clean section left in for potential EPEL Packaging.
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/chirpw
 %{python_sitelib}/%{name}-%{version}-py2.7.egg-info
-# Doesn't own this directory, let's own it.
-%dir %{python_sitelib}/%{name}/
-# Put files in directory.
-%{python_sitelib}/%{name}/*
-# Doesn't own this directory, let's own it.
-%dir %{python_sitelib}/chirpui/
-# Put files in directory.
-%{python_sitelib}/chirpui/*
+%{python_sitelib}/%{name}/
+%{python_sitelib}/chirpui/
 %{_datadir}/applications/%{name}.desktop
-# Doesn't own this directory, let's own it.
-%dir %{_datadir}/%{name}/
-# Put files in directory.
-%{_datadir}/%{name}/*.xsd
+%{_datadir}/%{name}/
 %{_mandir}/man1/chirpw.1.gz
 %{_datadir}/pixmaps/%{name}.png
 
+
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.12-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sun Mar 18 2012 Richard Shaw <hobbes1069@gmail.com> - 0.2.0-1
+- Update to latest upstream release.
 
 * Sun Nov 20 2011 Randall "Randy" Berry, N3LRX <dp67@fedoraproject.org> - 0.1.12-5
 - Add source for .desktop, per review