[chirp/f16: 8/11] "Undo git merge master due to conflicts."

[Richard Shaw]

commit 9e7103ac3b8373953762c58f6107be1f0144b8ed
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 19 15:52:12 2012 -0500

    "Undo git merge master due to conflicts."

 .gitignore                   |    4 +
 chirp-0.1.12-shebang.patch   |  458 ------------------------------------------
 chirp-COPYING-setup.py.patch |   12 -
 chirp.spec                   |   50 ++---
 sources                      |    2 +-
 5 files changed, 23 insertions(+), 503 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00167aa..5637b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 /chirp-0.1.12.tar.gz
+<<<<<<< HEAD
+=======
+/chirp-0.2.0.tar.gz
+>>>>>>> master
diff --git a/chirp.spec b/chirp.spec
index a13334b..3098d17 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,41 @@ 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.
+
+>>>>>>> master
 * Sun Nov 20 2011 Randall "Randy" Berry, N3LRX <dp67 at fedoraproject.org> - 0.1.12-5
 - Add source for .desktop, per review
 
diff --git a/sources b/sources
index fae1b77..4ae2837 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f38d1e80f5adc442cbf88e7848ff847  chirp-0.1.12.tar.gz
+1cf480a46742a069e5cc621a16656e1f  chirp-0.2.0.tar.gz