From 05d6d68714fff3a30e41c3c3916dc04f2089ef16 Mon Sep 17 00:00:00 2001
From: bojan <bojan@fedoraproject.org>
Date: May 25 2010 08:47:16 +0000
Subject: Fix upstream issue #454.


---

diff --git a/viewvc-1.1.5-attributeerror.patch b/viewvc-1.1.5-attributeerror.patch
new file mode 100644
index 0000000..0be21dd
--- /dev/null
+++ b/viewvc-1.1.5-attributeerror.patch
@@ -0,0 +1,12 @@
+Index: lib/sapi.py
+===================================================================
+--- lib/sapi.py (revision 2369)
++++ lib/sapi.py (revision 2370)
+@@ -33,6 +33,7 @@
+ # that character as-is, and sometimes needs to embed escaped values
+ # into HTML attributes.
+ def escape(s):
++  s = str(s)
+   s = string.replace(s, '&', '&amp;')
+   s = string.replace(s, '>', '&gt;')
+   s = string.replace(s, '<', '&lt;')
diff --git a/viewvc.spec b/viewvc.spec
index 51572ec..ecc547f 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
+Patch1:         viewvc-1.1.5-attributeerror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -43,6 +44,7 @@ with decent performance when run under Apache.
 
 %prep
 %setup -q
+%patch1 -p0 -b .attributeerror
 
 %build
 
@@ -118,6 +120,9 @@ with decent performance when run under Apache.
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Tue May 25 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-2
+- patch upstream issue #454
+
 * Tue Mar 30 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.5-1
 - bump up to 1.1.5