rpms/viewvc/EL-5 viewvc-1.1.5-attributeerror.patch, NONE, 1.1 viewvc.spec, 1.16, 1.17

[bojan]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20459

Modified Files:
	viewvc.spec 
Added Files:
	viewvc-1.1.5-attributeerror.patch 
Log Message:
Fix upstream issue #454.

viewvc-1.1.5-attributeerror.patch:
 sapi.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE viewvc-1.1.5-attributeerror.patch ---
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, '&', '&')
   s = string.replace(s, '>', '>')
   s = string.replace(s, '<', '&lt;')


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/EL-5/viewvc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- viewvc.spec	31 Mar 2010 21:43:10 -0000	1.16
+++ viewvc.spec	25 May 2010 08:55:38 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           viewvc
 Version:        1.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ Source0:        http://www.viewvc.org/%{
 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-11
@@ -44,6 +45,7 @@ with decent performance when run under A
 
 %prep
 %setup -q
+%patch1 -p0 -b .attributeerror
 
 %build
 
@@ -115,6 +117,9 @@ with decent performance when run under A
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Tue May 25 2010 Bojan Smojver <bojan at rexursive.com> - 1.1.5-3
+- patch upstream issue #454
+
 * Thu Apr  1 2010 Bojan Smojver <bojan at rexursive.com> - 1.1.5-2
 - pull in viewvc-httpd on upgrade from 1.0.x