pghmcfc pushed to trac-spamfilter-plugin (trac-spamfilter-plugin-0.5.0-0.1.20141115svn13321.el6). "Update to current svn snapshot for 0.12 branch (0.5.0, r13321) (..more)"

[notifications at fedoraproject.org]

>From 997dc87c2e9c396210e147074cdfadb6f0030467 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Tue, 31 Mar 2015 14:06:39 +0100
Subject: Update to current svn snapshot for 0.12 branch (0.5.0, r13321)

- Update to current svn snapshot for 0.12 branch
  - Support more external services
  - Bug fixes: #10490, #10493, #10537
  - Fix encoding error in case HTTP header lines are not ASCII
  - Fix external training option
- Drop dependency on orphaned (apparently dead upstream) spambayes
- BuildRequire everything that we Require to avoid unpleasant dependency
  surprises with the built package

diff --git a/.gitignore b/.gitignore
index d94b899..b4c3742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /TracSpamFilter-0.2.1dev-r9626.tar.bz2
 /TracSpamFilter-0.4.7dev-r10633.tar.bz2
 /TracSpamFilter-0.4.7dev-r10756.tar.bz2
+/TracSpamFilter-0.5.0dev-r13321.tar.bz2
diff --git a/pull-from-svn.sh b/pull-from-svn.sh
index 8c8b6ee..7c3a021 100755
--- a/pull-from-svn.sh
+++ b/pull-from-svn.sh
@@ -8,8 +8,8 @@ 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
+svnrel=13321
+version=0.5.0
 
 # 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..164b1cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d1032d7126407c30c56c9a532e365d3  TracSpamFilter-0.4.7dev-r10756.tar.bz2
+f91e4241e3e8de427f552d8f819e675b  TracSpamFilter-0.5.0dev-r13321.tar.bz2
diff --git a/trac-spamfilter-plugin.spec b/trac-spamfilter-plugin.spec
index e825703..91e8089 100644
--- a/trac-spamfilter-plugin.spec
+++ b/trac-spamfilter-plugin.spec
@@ -1,8 +1,8 @@
-%global svnrev 10756
+%global svnrev 13321
 
 Name:           trac-spamfilter-plugin
-Version:        0.4.7
-Release:        0.11.20110716svn%{svnrev}%{?dist}
+Version:        0.5.0
+Release:        0.1.20141115svn%{svnrev}%{?dist}
 Summary:        Spam-Filter plugin for Trac
 Group:          Applications/Internet
 License:        BSD
@@ -11,12 +11,14 @@ Source0:        TracSpamFilter-%{version}dev-r%{svnrev}.tar.bz2
 Source1:        pull-from-svn.sh
 BuildArch:      noarch
 BuildRequires:  python2-devel
+BuildRequires:  python-dns
+BuildRequires:  python-imaging
 BuildRequires:  python-setuptools
-Requires:       trac >= 0.12
+BuildRequires:  trac >= 0.12
 Requires:       python-dns
 Requires:       python-imaging
 Requires:       python-setuptools
-Requires:       spambayes
+Requires:       trac >= 0.12
 
 %description
 TracSpamFilter is a plugin for Trac (http://trac.edgewall.com/) that provides
@@ -35,9 +37,25 @@ illegitimate/unwanted content) in submitted content.
 %files
 %doc README.txt
 %{python_sitelib}/TracSpamFilter-%{version}dev_r%{svnrev}-py*.egg-info/
-%{python_sitelib}/tracspamfilter/
+%dir %{python_sitelib}/tracspamfilter/
+%{python_sitelib}/tracspamfilter/*.py*
+%{python_sitelib}/tracspamfilter/captcha/
+%{python_sitelib}/tracspamfilter/filters/
+%{python_sitelib}/tracspamfilter/fonts/
+%{python_sitelib}/tracspamfilter/htdocs/
+%{python_sitelib}/tracspamfilter/templates/
 
 %changelog
+* Tue Mar 31 2015 Paul Howarth <paul at city-fan.org> - 0.5.0-0.1.20141115svn13321
+- Update to current svn snapshot for 0.12 branch
+  - Support more external services
+  - Bug fixes: #10490, #10493, #10537
+  - Fix encoding error in case HTTP header lines are not ASCII
+  - Fix external training option
+- Drop dependency on orphaned (apparently dead upstream) spambayes
+- BuildRequire everything that we Require to avoid unpleasant dependency
+  surprises with the built package
+
 * Sun Jul 17 2011 Paul Howarth <paul at city-fan.org> - 0.4.7-0.11.20110716svn10756
 - Update to current svn snapshot
   - Various Blogspam timeout fixes
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/trac-spamfilter-plugin.git/commit/?h=trac-spamfilter-plugin-0.5.0-0.1.20141115svn13321.el6&id=997dc87c2e9c396210e147074cdfadb6f0030467