[bitten] Upgrade to 0.6 and add patch for new Trac versions

[Tim Niemueller]

commit dce5581fb1e8238b8405a6852e167497162d50ea
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Tue Sep 23 15:47:37 2014 +0200

    Upgrade to 0.6 and add patch for new Trac versions

 .gitignore                |    2 +-
 Bitten-0.6-username.patch |   11 +++++++++++
 bitten.spec               |   11 +++++++++--
 sources                   |    2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2dee42e..bc1ddca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/Bitten-0.6b3*
 /noarch
 /.build*
 /*.src.rpm
+/Bitten-0.6.tar.gz
diff --git a/Bitten-0.6-username.patch b/Bitten-0.6-username.patch
new file mode 100644
index 0000000..b48930b
--- /dev/null
+++ b/Bitten-0.6-username.patch
@@ -0,0 +1,11 @@
+diff -urN Bitten-0.6b3/bitten/slave.py Bitten-0.6b3.username/bitten/slave.py
+--- Bitten-0.6b3/bitten/slave.py	2010-10-21 12:02:42.000000000 +0200
++++ Bitten-0.6b3.username/bitten/slave.py	2014-09-23 11:59:13.509163066 +0200
+@@ -318,6 +318,7 @@
+                                           "authentication" % url[:-7])
+                                 raise ExitSlave(EX_NOPERM)
+                             values = {'user': self.username, 
++                                      'username': self.username,
+                                       'password':
+                                           self.password_mgr.find_user_password(
+                                                                 None, url)[1],
diff --git a/bitten.spec b/bitten.spec
index 1293455..bd1e01c 100644
--- a/bitten.spec
+++ b/bitten.spec
@@ -19,8 +19,9 @@
 #define svnrev 777
 
 Name:           bitten
-Version:        0.6b3
-Release:        0.8%{?dist}
+Version:        0.6
+Release:        1%{?dist}
+Epoch:          1
 Summary:        A continuous integration plugin for Trac
 Group:          Development/Tools
 License:        BSD
@@ -36,6 +37,7 @@ Source2:        bitten-slave.init
 Source3:        bitten-slave.sysconf
 Source4:        bitten-slave.logrotate
 Patch0:         Bitten-0.6dev-r777-git.patch
+Patch1:         Bitten-0.6-username.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -88,6 +90,7 @@ Bitten build slave.
 #  -n Bitten-{version}dev-r{svnrev}
 %setup -q -n Bitten-%{version}
 %patch0 -p1 -b .git
+%patch1 -p1 -b .username
 
 %build
 %{__python} setup.py build
@@ -194,6 +197,10 @@ fi
 %dir %attr(-,%username,%username) %{_var}/lib/bitten-slave
 
 %changelog
+* Tue Sep 23 2014 Tim Niemueller <timn at fedoraproject.org> 0.6-1
+- Update to latest stable release
+- Add patch to properly set username field for form auth
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6b3-0.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 6abfad8..11ee389 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89c1201bea6ca2ee61e7ac4dde617197  Bitten-0.6b3.tar.gz
+a8eb8bf69f7f8ad73c27dfd39e8acd53  Bitten-0.6.tar.gz