packages: redmine/redmine.spec, redmine/redmine-git-parse.patch (NEW) - 0.9...

baggins baggins at pld-linux.org
Thu Dec 2 12:45:33 CET 2010


Author: baggins                      Date: Thu Dec  2 11:45:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.9.6
- make git log parser encoding indepentent (or we'll get
  'invalid byte sequence in UTF-8' and http 500 in case of problems)

---- Files affected:
packages/redmine:
   redmine.spec (1.32 -> 1.33) , redmine-git-parse.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/redmine/redmine.spec
diff -u packages/redmine/redmine.spec:1.32 packages/redmine/redmine.spec:1.33
--- packages/redmine/redmine.spec:1.32	Mon Jun 21 14:30:05 2010
+++ packages/redmine/redmine.spec	Thu Dec  2 12:45:28 2010
@@ -6,12 +6,12 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	Flexible project management web application
 Name:		redmine
-Version:	0.9.4
+Version:	0.9.6
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://rubyforge.org/frs/download.php/70486/%{name}-%{version}.tar.gz
-# Source0-md5:	43c2ab81ad086cc78802b0f3670e5f07
+Source0:	http://rubyforge.org/frs/download.php/71530/%{name}-%{version}.tar.gz
+# Source0-md5:	550015d3c5a6158dfe4b656640807513
 Source1:	%{name}-rfpdf.tar.bz2
 # Source1-md5:	83da153b550237f47a3a3c1c2acaac20
 Source2:	%{name}.conf
@@ -28,6 +28,7 @@
 Patch6:		%{name}-rfpdf.patch
 Patch7:		%{name}-mercurial.patch
 Patch8:		%{name}-gantt.patch
+Patch9:		%{name}-git-parse.patch
 URL:		http://www.redmine.org/
 BuildRequires:	dos2unix
 BuildRequires:	perl-base
@@ -134,6 +135,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 find -type f -print0 | \
 	xargs -0 %{__sed} -i -e 's,/usr/bin/env ruby,%{__ruby},' \
@@ -280,6 +282,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2010/12/02 11:45:28  baggins
+- 0.9.6
+- make git log parser encoding indepentent (or we'll get
+  'invalid byte sequence in UTF-8' and http 500 in case of problems)
+
 Revision 1.32  2010/06/21 12:30:05  baggins
 - rel 1
 

================================================================
Index: packages/redmine/redmine-git-parse.patch
diff -u /dev/null packages/redmine/redmine-git-parse.patch:1.1
--- /dev/null	Thu Dec  2 12:45:33 2010
+++ packages/redmine/redmine-git-parse.patch	Thu Dec  2 12:45:28 2010
@@ -0,0 +1,10 @@
+--- redmine-0.9.4/lib/redmine/scm/adapters/git_adapter.rb~	2010-12-02 12:25:36.877495204 +0100
++++ redmine-0.9.4/lib/redmine/scm/adapters/git_adapter.rb	2010-12-02 12:29:36.839495202 +0100
+@@ -130,6 +130,7 @@
+             revno = 1
+ 
+             io.each_line do |line|
++              line.force_encoding(Encoding::ASCII_8BIT) if line.respond_to?(:force_encoding)
+               if line =~ /^commit ([0-9a-f]{40})$/
+                 key = "commit"
+                 value = $1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine.spec?r1=1.32&r2=1.33&f=u



More information about the pld-cvs-commit mailing list