[chirp/f15: 8/10] Update to 0.2.0, remove old patches and add new patch.

[Richard Shaw]

commit 6a2aaef03acfbf508d7bef14f2c98214a98243a9
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 19 16:05:36 2012 -0500

    Update to 0.2.0, remove old patches and add new patch.

 chirp-0.1.12-shebang.patch   |  458 ------------------------------------------
 chirp-0.2.0-install.patch    |   23 ++
 chirp-COPYING-setup.py.patch |   12 -
 chirp.spec                   |   49 ++---
 4 files changed, 40 insertions(+), 502 deletions(-)
---
diff --git a/chirp-0.2.0-install.patch b/chirp-0.2.0-install.patch
new file mode 100644
index 0000000..ae96713
--- /dev/null
+++ b/chirp-0.2.0-install.patch
@@ -0,0 +1,23 @@
+diff -Naur chirp-0.2.0.orig/setup.py chirp-0.2.0/setup.py
+--- chirp-0.2.0.orig/setup.py	2012-02-29 02:01:12.000000000 -0600
++++ chirp-0.2.0/setup.py	2012-03-19 12:13:15.007062801 -0500
+@@ -105,13 +105,12 @@
+         packages=["chirp", "chirpui"],
+         version=CHIRP_VERSION,
+         scripts=["chirpw"],
+-        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/pixmaps', ['share/chirp.png']),
+-                    ('usr/share/man/man1', ["share/chirpw.1"]),
+-                    ('usr/share/chirp/stock_configs', stock_configs),
++        data_files=[('share/applications', desktop_files),
++                    ('share/chirp/images', image_files),
++                    ('share/chirp', xsd_files),
++		    ('share/pixmaps', ['share/chirp.png']),
++                    ('share/man/man1', ["share/chirpw.1"]),
++                    ('share/chirp/stock_configs', stock_configs),
+                     ] + locale_files)
+ 
+ def rpttool_build():
diff --git a/chirp.spec b/chirp.spec
index a13334b..f678a04 100644
--- a/chirp.spec
+++ b/chirp.spec
@@ -1,28 +1,23 @@
 Name:           chirp
-Version:        0.1.12
-Release:        5%{?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
 BuildRequires:  desktop-file-utils
+BuildRequires:  libxml2-python
+BuildRequires:  pyserial
 Requires:       pyserial
 
 %description
@@ -31,50 +26,40 @@ 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
+* Sun Mar 18 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.2.0-1
+- Update to latest upstream release.
+
 * Sun Nov 20 2011 Randall "Randy" Berry, N3LRX <dp67 at fedoraproject.org> - 0.1.12-5
 - Add source for .desktop, per review