From 521b3da51b23263ea27c943e51a376e3980c282e Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Tue, 25 May 2010 22:35:09 +0000
Subject: [PATCH] - Update to 0.6.6

---
 .cvsignore                                    |  2 +-
 ....5_move_locale_files_outside_sitelib.patch | 56 -------------------
 python-sphinx-0.6.5_setuptools.patch          | 24 --------
 python-sphinx.spec                            | 12 ++--
 sources                                       |  2 +-
 5 files changed, 7 insertions(+), 89 deletions(-)
 delete mode 100644 python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch
 delete mode 100644 python-sphinx-0.6.5_setuptools.patch

diff --git a/.cvsignore b/.cvsignore
index 11c96c5..e348134 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Sphinx-0.6.5.tar.gz
+Sphinx-0.6.6.tar.gz
diff --git a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch b/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch
deleted file mode 100644
index 76dffc4..0000000
--- a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# HG changeset patch
-# Parent 552e51b26229a9a918c76a401f2f487bf81f2ee6
-
-Index: Sphinx-0.6.5/sphinx/builders/html.py
-===================================================================
---- Sphinx-0.6.5.orig/sphinx/builders/html.py
-+++ Sphinx-0.6.5/sphinx/builders/html.py
-@@ -10,6 +10,7 @@
- """
- 
- import os
-+import sys
- import codecs
- import posixpath
- import cPickle as pickle
-@@ -91,10 +92,15 @@ class StandaloneHTMLBuilder(Builder):
-             self.link_suffix = self.out_suffix
- 
-         if self.config.language is not None:
--            jsfile = path.join(package_dir, 'locale', self.config.language,
--                               'LC_MESSAGES', 'sphinx.js')
--            if path.isfile(jsfile):
--                self.script_files.append('_static/translations.js')
-+            jsfile_list = [path.join(package_dir, 'locale',
-+                self.config.language, 'LC_MESSAGES', 'sphinx.js'),
-+                path.join(sys.prefix, 'share/sphinx/locale',
-+                    self.config.language, 'sphinx.js')]
-+
-+            for jsfile in jsfile_list:
-+                if path.isfile(jsfile):
-+                    self.script_files.append('_static/translations.js')
-+                    break
- 
-     def init_templates(self):
-         Theme.init_themes(self)
-@@ -528,11 +534,15 @@ class StandaloneHTMLBuilder(Builder):
-         f.close()
-         # then, copy translations JavaScript file
-         if self.config.language is not None:
--            jsfile = path.join(package_dir, 'locale', self.config.language,
--                               'LC_MESSAGES', 'sphinx.js')
--            if path.isfile(jsfile):
--                copyfile(jsfile, path.join(self.outdir, '_static',
--                                           'translations.js'))
-+            jsfile_list = [path.join(package_dir, 'locale',
-+                self.config.language, 'LC_MESSAGES', 'sphinx.js'),
-+                path.join(sys.prefix, 'share/sphinx/locale',
-+                    self.config.language, 'sphinx.js')]
-+            for jsfile in jsfile_list:
-+                if path.isfile(jsfile):
-+                    copyfile(jsfile, path.join(self.outdir, '_static',
-+                                               'translations.js'))
-+                    break
-         # then, copy over all user-supplied static files
-         if self.theme:
-             staticdirnames = [path.join(themepath, 'static')
diff --git a/python-sphinx-0.6.5_setuptools.patch b/python-sphinx-0.6.5_setuptools.patch
deleted file mode 100644
index e8bcc44..0000000
--- a/python-sphinx-0.6.5_setuptools.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# Parent 5da6d572bd088b04711b3bf70991c976d8f9c605
-
-Index: Sphinx-0.6.5/setup.py
-===================================================================
---- Sphinx-0.6.5.orig/setup.py
-+++ Sphinx-0.6.5/setup.py
-@@ -1,10 +1,13 @@
- # -*- coding: utf-8 -*-
--import ez_setup
--ez_setup.use_setuptools()
-+try:
-+    from setuptools import setup, find_packages
-+except ImportError:
-+    import ez_setup
-+    ez_setup.use_setuptools()
-+    from setuptools import setup, find_packages
- 
- import os
- import sys
--from setuptools import setup, find_packages
- from distutils import log
- 
- import sphinx
diff --git a/python-sphinx.spec b/python-sphinx.spec
index 52c5b4f..2fc0770 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -5,16 +5,14 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    0.6.5
-Release:    2%{?dist}
+Version:    0.6.6
+Release:    1%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
 License:    BSD
 URL:        http://sphinx.pocoo.org/
 Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
-Patch0:     %{name}-0.6.5_setuptools.patch
-Patch1:     %{name}-0.6.5_move_locale_files_outside_sitelib.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:     noarch
@@ -77,9 +75,6 @@ This package contains documentation in reST and HTML formats.
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
-%patch0 -p1 -b .setuptools
-%patch1 -p1 -b .language_files
-
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
@@ -153,6 +148,9 @@ make test
 
 
 %changelog
+* Tue May 25 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-1
+- Update to 0.6.6
+
 * Fri May 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-2
 - Few minor tweaks to Gareth's spec file update
 
diff --git a/sources b/sources
index 6c0c1e6..a951d99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86dd5dbd55cb44d1f8091a4a1c3743b2  Sphinx-0.6.5.tar.gz
+840f6dbbecbb4979a204909f5656c723  Sphinx-0.6.6.tar.gz