From 4b2243da9da95c9a46e2d63d51fa7bc500930845 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 30 Oct 2008 19:01:20 +0000
Subject: [PATCH] update to 0.16, fix bz 469229

---
 .cvsignore                          |  3 +--
 pyxdg-0.16-indentfix-bz469229.patch | 12 ++++++++++++
 pyxdg.spec                          | 12 ++++++++----
 sources                             |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 pyxdg-0.16-indentfix-bz469229.patch

diff --git a/.cvsignore b/.cvsignore
index 8fad81b..d75cc46 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-pyxdg-0.14.tar.gz
-pyxdg-0.15.tar.gz
+pyxdg-0.16.tar.gz
diff --git a/pyxdg-0.16-indentfix-bz469229.patch b/pyxdg-0.16-indentfix-bz469229.patch
new file mode 100644
index 0000000..fc7d8c1
--- /dev/null
+++ b/pyxdg-0.16-indentfix-bz469229.patch
@@ -0,0 +1,12 @@
+diff -up pyxdg-0.16/xdg/DesktopEntry.py.BAD pyxdg-0.16/xdg/DesktopEntry.py
+--- pyxdg-0.16/xdg/DesktopEntry.py.BAD	2008-10-30 14:22:37.000000000 -0400
++++ pyxdg-0.16/xdg/DesktopEntry.py	2008-10-30 14:22:52.000000000 -0400
+@@ -181,7 +181,7 @@ class DesktopEntry(IniFile):
+         else:
+             #OnlyShowIn and NotShowIn
+             if self.content[group].has_key("OnlyShowIn") and self.content[group].has_key("NotShowIn"):
+-            self.errors.append("Group may either have OnlyShowIn or NotShowIn, but not both")
++                self.errors.append("Group may either have OnlyShowIn or NotShowIn, but not both")
+ 
+     def checkKey(self, key, value, group):
+         # standard keys     
diff --git a/pyxdg.spec b/pyxdg.spec
index 0371abe..75a989e 100644
--- a/pyxdg.spec
+++ b/pyxdg.spec
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pyxdg
-Version:        0.15
-Release:        6%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Python library to access freedesktop.org standards
-
-
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://freedesktop.org/Software/pyxdg
 Source0:        http://www.freedesktop.org/~lanius/%{name}-%{version}.tar.gz
+Patch0:		pyxdg-0.16-indentfix-bz469229.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -20,6 +19,7 @@ PyXDG is a python library to access freedesktop.org standards
 
 %prep
 %setup -q
+%patch0 -p1 -b .indentfix
 
 %build
 %{__python} setup.py build
@@ -38,6 +38,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/pyxdg-*.egg-info
 
 %changelog
+* Thu Oct 30 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.16-1
+- update to 0.16
+- fix indent bug in DesktopEntry.py (bz 469229)
+
 * Sat Apr  5 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.15-6
 - add egg-info (fixes FTBFS bz 440813)
 
diff --git a/sources b/sources
index bad87b0..a190f18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86a5441285fc908145414b63348d11a3  pyxdg-0.15.tar.gz
+55b71ec0df9509e05e562ac402b119f7  pyxdg-0.16.tar.gz