[python-mwlib] Update to 0.13.8

[Ian Weller]

commit ac902c282bdc6e0a3ab4df1dc2fedaad8b89cb23
Author: Ian Weller <ian at ianweller.org>
Date:   Sat Jun 16 18:00:07 2012 -0500

    Update to 0.13.8

 .gitignore                        |    1 +
 mwlib-clean-up-dependencies.patch |   16 +++++++-------
 mwlib-unbundle-apipkg.patch       |   38 -------------------------------------
 python-mwlib.spec                 |   18 ++++++----------
 sources                           |    2 +-
 5 files changed, 17 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8567f4f..5e71404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ e4adff8732c4.tar.bz2
 /mwlib-0.13.4.zip
 /mwlib-0.13.5.zip
 /mwlib-0.13.6.zip
+/mwlib-0.13.8.zip
diff --git a/mwlib-clean-up-dependencies.patch b/mwlib-clean-up-dependencies.patch
index a5f9549..d516a98 100644
--- a/mwlib-clean-up-dependencies.patch
+++ b/mwlib-clean-up-dependencies.patch
@@ -1,15 +1,15 @@
-diff -up mwlib-0.13.4/setup.py.orig1 mwlib-0.13.4/setup.py
---- mwlib-0.13.4/setup.py.orig1	2012-02-15 15:55:10.910302467 -0600
-+++ mwlib-0.13.4/setup.py	2012-02-15 15:55:56.541546323 -0600
+diff -up mwlib-0.13.8/setup.py.orig mwlib-0.13.8/setup.py
+--- mwlib-0.13.8/setup.py.orig	2012-06-16 17:55:36.741032305 -0500
++++ mwlib-0.13.8/setup.py	2012-06-16 17:57:39.552713787 -0500
 @@ -69,9 +69,9 @@ def main():
          build_deps()   # this is a git clone
  
      install_requires = ["pyparsing>=1.4.11", "odfpy>=0.9, <0.10",
 -                        "gevent", "timelib>=0.2", "bottle>=0.10",
 +                        "gevent", "python-dateutil", "bottle>=0.10",
-                         "pyPdf>=1.12", "apipkg", "qserve>=0.2.7",
--                        "roman", "lxml", "py>=1.4", "sqlite3dbm"]
-+                        "lxml", "py>=1.4", "sqlite3dbm"]
-     if sys.version_info[:2] < (2, 6):
-         install_requires.append("simplejson>=1.3")
+                         "pyPdf>=1.12", "apipkg>=1.2", "qserve>=0.2.7",
+-                        "roman", "lxml", "py>=1.4", "sqlite3dbm",
++                        "lxml", "py>=1.4", "sqlite3dbm",
+                         "simplejson>=2.5"]
  
+     ext_modules = []
diff --git a/python-mwlib.spec b/python-mwlib.spec
index f9fb262..b464eaa 100644
--- a/python-mwlib.spec
+++ b/python-mwlib.spec
@@ -6,7 +6,7 @@
 }
 
 Name:           python-%{module_name}
-Version:        0.13.6
+Version:        0.13.8
 Release:        1%{?dist}
 Summary:        MediaWiki parser and utility library
 
@@ -19,11 +19,8 @@ Source0:        http://pypi.python.org/packages/source/m/mwlib/%{module_name}-%{
 #   timelib: replaced with dateutil
 Patch0:         mwlib-clean-up-dependencies.patch
 
-# Unbundles apipkg
-Patch1:         mwlib-unbundle-apipkg.patch
-
 # Replaces timelib with dateutil
-Patch2:         mwlib-replace-timelib-with-dateutil.patch
+Patch1:         mwlib-replace-timelib-with-dateutil.patch
 
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -39,6 +36,7 @@ Requires:       python-lxml
 Requires:       python-py >= 1.4
 Requires:       python-qserve >= 0.2.3
 Requires:       python-setuptools
+Requires:       python-simplejson >= 2.5
 Requires:       python-sqlite3dbm
 
 %description
@@ -53,13 +51,8 @@ in order to generate PDF documents from Wikipedia articles.
 # Clean up dependencies
 %patch0 -p1
 
-# Unbundle apipkg
-rm mwlib/apipkg.py
-%patch1 -p1
-rm mwlib.egg-info/*.orig
-
 # Replace timelib with dateutil
-%patch2 -p1
+%patch1 -p1
 
 sed -i '/^#!/d' mwlib/*.py mwlib/*/*.py mwlib/snippets.txt
 chmod a-x mwlib/*.py mwlib/*/*.py mwlib/snippets.txt
@@ -84,6 +77,9 @@ rm %{buildroot}%{python_sitearch}/%{module_name}/templ/*.c
 
 
 %changelog
+* Sat Jun 16 2012 Ian Weller <iweller at redhat.com> - 0.13.8-1
+- Update to 0.13.8
+
 * Tue Mar 13 2012 Ian Weller <iweller at redhat.com> - 0.13.6-1
 - enhancement: implement protocol relative urls in named links
 - enhancement: make mw-zip -gg post test.pediapress.com
diff --git a/sources b/sources
index e5de085..e6a5c31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dade43c979fa628b4fee7441acebc7e  mwlib-0.13.6.zip
+f03c086ee043029cf7845761f279ecbd  mwlib-0.13.8.zip