[trac-spamfilter-plugin] Update to trac 1.0 branch

[Paul Howarth]

commit c81da6f75ca1dd3cfed9c345eda8f6d8cbd5a77c
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Mar 8 12:47:29 2013 +0000

    Update to trac 1.0 branch
    
    - Update to trac 1.0 branch
    - Fix PIL imports to work with pillow (#896262)
    - Require python-pillow rather than python-imaging

 .gitignore                          |    2 +-
 pull-from-svn.sh                    |   16 ++++++++++++----
 sources                             |    2 +-
 trac-spamfilter-plugin-pillow.patch |   23 +++++++++++++++++++++++
 trac-spamfilter-plugin.spec         |   19 ++++++++++++++-----
 5 files changed, 51 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d94b899..19fd33b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /TracSpamFilter-0.2.1dev-r6990.tar.gz
 /TracSpamFilter-0.2.1dev-r9626.tar.bz2
-/TracSpamFilter-0.4.7dev-r10633.tar.bz2
 /TracSpamFilter-0.4.7dev-r10756.tar.bz2
+/TracSpamFilter-0.7.3dev-r11702.tar.bz2
diff --git a/pull-from-svn.sh b/pull-from-svn.sh
index 8c8b6ee..f9594ca 100755
--- a/pull-from-svn.sh
+++ b/pull-from-svn.sh
@@ -3,13 +3,13 @@
 # Source for trac-spamfilter-plugin comes from SVN repository at svn.edgewall.com
 site=http://svn.edgewall.com/
 repo=repos/trac/plugins
-svnname=spam-filter-captcha
+svnname=spam-filter
 tarname=TracSpamFilter
 
 # Specify the branch and revision we're after, plus the version upstream calls itself
-branch=0.12
-svnrel=10756
-version=0.4.7
+branch=1.0
+svnrel=11702
+version=0.7.3
 
 # Pull the desired version from svn
 svn checkout -r ${svnrel} ${site}${repo}/${branch}/${svnname} ${tarname}-${version}
@@ -25,6 +25,14 @@ done
 # Make a tarball
 cd ${tarname}-${version}
 python setup.py sdist --formats bztar
+# Work around svn 1.0 incompatibility (http://trac.edgewall.org/ticket/10658)
+if [ ! -f dist/${tarname}-${version}dev-r${svnrel}.tar.bz2 -a -f dist/${tarname}-${version}dev-r0.tar.bz2 ]; then
+	tar xfj dist/${tarname}-${version}dev-r0.tar.bz2
+	rm dist/${tarname}-${version}dev-r0.tar.bz2
+	grep -rl dev-r0 ${tarname}-${version}dev-r0 | xargs sed -i -e "s/dev-r0/dev-r${svnrel}/"
+	mv ${tarname}-${version}dev-r0 ${tarname}-${version}dev-r${svnrel}
+	tar cfj dist/${tarname}-${version}dev-r${svnrel}.tar.bz2 ${tarname}-${version}dev-r${svnrel}
+fi
 cd -
 mv ${tarname}-${version}/dist/${tarname}-${version}dev-r${svnrel}.tar.bz2 .
 # Set time of tarball to time of last commit
diff --git a/sources b/sources
index f2daf64..4fb8b65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d1032d7126407c30c56c9a532e365d3  TracSpamFilter-0.4.7dev-r10756.tar.bz2
+1f0bfba56eee94a8b451699af31829c5  TracSpamFilter-0.7.3dev-r11702.tar.bz2
diff --git a/trac-spamfilter-plugin-pillow.patch b/trac-spamfilter-plugin-pillow.patch
new file mode 100644
index 0000000..331538e
--- /dev/null
+++ b/trac-spamfilter-plugin-pillow.patch
@@ -0,0 +1,23 @@
+Fix imports for python-pillow compatibility
+
+http://fedoraproject.org/wiki/Features/Pillow
+http://bugzilla.redhat.com/896262
+http://trac.edgewall.org/ticket/11031
+
+--- tracspamfilter/captcha/image.py
++++ tracspamfilter/captcha/image.py
+@@ -19,10 +19,10 @@ import random
+ from StringIO import StringIO
+ 
+ # PIL
+-import Image
+-import ImageFont
+-import ImageDraw
+-import ImageFilter
++from PIL import Image
++from PIL import ImageFont
++from PIL import ImageDraw
++from PIL import ImageFilter
+ 
+ from trac.core import *
+ from trac.util.html import html
diff --git a/trac-spamfilter-plugin.spec b/trac-spamfilter-plugin.spec
index 76fa65f..d52ed11 100644
--- a/trac-spamfilter-plugin.spec
+++ b/trac-spamfilter-plugin.spec
@@ -1,20 +1,21 @@
-%global svnrev 10756
+%global svnrev 11702
 
 Name:           trac-spamfilter-plugin
-Version:        0.4.7
-Release:        0.14.20110716svn%{svnrev}%{?dist}
+Version:        0.7.3
+Release:        0.15.20130228svn%{svnrev}%{?dist}
 Summary:        Spam-Filter plugin for Trac
 Group:          Applications/Internet
 License:        BSD
 URL:            http://trac.edgewall.org/wiki/SpamFilter
 Source0:        TracSpamFilter-%{version}dev-r%{svnrev}.tar.bz2
 Source1:        pull-from-svn.sh
+Patch0:		trac-spamfilter-plugin-pillow.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-Requires:       trac >= 0.12
+Requires:       trac >= 1.0
 Requires:       python-dns
-Requires:       python-imaging
+Requires:       python-pillow
 Requires:       python-setuptools
 Requires:       spambayes
 
@@ -26,6 +27,9 @@ illegitimate/unwanted content) in submitted content.
 %prep
 %setup -n TracSpamFilter-%{version}dev-r%{svnrev} -q
 
+# Fix PIL imports to work with pillow (#896262)
+%patch0
+
 %build
 %{__python} setup.py build
 
@@ -38,6 +42,11 @@ illegitimate/unwanted content) in submitted content.
 %{python_sitelib}/tracspamfilter/
 
 %changelog
+* Fri Mar  8 2013 Paul Howarth <paul at city-fan.org> - 0.7.3-0.15.20130228svn11702
+- Update to trac 1.0 branch
+- Fix PIL imports to work with pillow (#896262)
+- Require python-pillow rather than python-imaging
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.7-0.14.20110716svn10756
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild