From ce17c8c971b8f71be0011ba3aa08615abff0a1fc Mon Sep 17 00:00:00 2001
From: Toshio くらとみ <toshio@fedoraproject.org>
Date: Jun 14 2009 13:02:13 +0000
Subject: - Merge 0.3.12.1 and 0.3.13 releases together.

- Changes for new fas and new pkgdb server.

---

diff --git a/.cvsignore b/.cvsignore
index 4ded370..cedfc48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-python-fedora-0.3.12.1.tar.gz
+python-fedora-0.3.13.1.tar.gz
diff --git a/python-fedora-0.3.12.1-bugzilla_email.patch b/python-fedora-0.3.12.1-bugzilla_email.patch
deleted file mode 100644
index e17cf47..0000000
--- a/python-fedora-0.3.12.1-bugzilla_email.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'fedora/client/fas2.py'
---- fedora/client/fas2.py	2009-06-03 19:38:59 +0000
-+++ fedora/client/fas2.py	2009-06-11 16:13:05 +0000
-@@ -143,6 +143,8 @@
-                 101475: 'mail@romal.de',
-                 # Mathieu Bridon: mathieu.bridon@gmail.com
-                 100753: 'bochecha@fedoraproject.org',
-+                # Davide Cescato: davide.cescato@iaeste.ch
-+                123204: 'ceski@fedoraproject.org',
-                 }
-         # A few people have an email account that is used in owners.list but
-         # have setup a bugzilla account for their primary account system email
-
diff --git a/python-fedora.spec b/python-fedora.spec
index 27eb929..db169f9 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -1,21 +1,20 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.12.1
-Release:        2%{?dist}
+Version:        0.3.13.1
+Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
 License:        GPLv2
 URL:            https://fedorahosted.org/python-fedora/
 Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
-Patch0:         python-fedora-0.3.12.1-bugzilla_email.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
-BuildRequires:  python-paver
+BuildRequires:  python-paver >= 1.0
 BuildRequires:  python-sphinx
 %if 0%{?fedora} >= 9
 BuildRequires:  python-cherrypy2
@@ -45,7 +44,6 @@ TurboGears Applications such as Bodhi, PackageDB, MirrorManager, and FAS2.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 paver build
@@ -54,10 +52,6 @@ paver html
 %install
 rm -rf %{buildroot}
 paver install --skip-build --root %{buildroot}
-%if 0%{?fedora} <= 10
-    paver install_catalogs --root %{buildroot} --install-catalogs \
-             %{_datadir}/locale --skip-build
-%endif
 
 mv build-doc/html doc/
 %find_lang %{name}
@@ -71,6 +65,13 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Sat Jun 13 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.13.1-1
+- Merge 0.3.12.1 and 0.3.13 releases together.
+
+* Sat Jun 13 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.13-1
+- New release.  Some new pkgdb API, defaultdict implementation, and a
+  bugfix to response code from the shipped login controller.
+
 * Wed Jun 11 2009 Ricky Zhou <ricky@fedoraproject.org> - 0.3.12.1-2
 - Backport a patch to add a bugzilla_email entry.
 
diff --git a/sources b/sources
index 332d458..002ae3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71067342084e6a1e81e2edabb1464496  python-fedora-0.3.12.1.tar.gz
+c42d24ef3fb28b15a3a4f2ad93d407c8  python-fedora-0.3.13.1.tar.gz