OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Aug-2009 19:13:09
Branch: HEAD Handle: 2009080718130801
Modified files:
openpkg-src/rt rt.patch rt.spec
Log:
try to fix packaging
Summary:
Revision Changes Path
1.24 +13 -63 openpkg-src/rt/rt.patch
1.203 +1 -1 openpkg-src/rt/rt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.patch
============================================================================
$ cvs diff -u -r1.23 -r1.24 rt.patch
--- openpkg-src/rt/rt.patch 6 Jul 2007 07:27:10 -0000 1.23
+++ openpkg-src/rt/rt.patch 7 Aug 2009 17:13:08 -0000 1.24
@@ -1,66 +1,16 @@
-Index: html/Ticket/Elements/ShowMessageStanza
---- html/Ticket/Elements/ShowMessageStanza.orig 2007-04-24 19:21:42
+0200
-+++ html/Ticket/Elements/ShowMessageStanza 2007-07-06 09:24:49 +0200
-@@ -48,12 +48,40 @@
- % if (ref($Message)) {
- <div class="message-stanza-depth-<% $Depth %>">
- <%perl>
--foreach my $stanza (@$Message) {
-- if ( ref $stanza eq "ARRAY" ) {
-- $m->comp( 'ShowMessageStanza',
-- Depth => $Depth + 1,
-- Transaction => $Transaction,
-- Message => $stanza );
-+ my $msg='';
-+ my $wrapfunc = sub {
-+ my $max = 0;
-+ foreach ( split ( /\n/, $_[0] ) ) {
-+ $max = length if length > $max;
-+ }
-+ if ( $max > 76 ) {
-+ require Text::Wrapper;
-+ my $wrapper = new Text::Wrapper(
-+ columns => 70,
-+ body_start => ( $max > 70 * 3 ? ' ' : '' ),
-+ par_start => '');
-+ $_[0] = $wrapper->wrap($_[0]);
-+ }
-+ RT::Interface::Web::EscapeUTF8(\$_[0]);
-+ $m->comp('/Elements/Callback', content => \$_[0], %ARGS);
-+ };
-+ foreach my $stanza (@$Message) {
-+ if ( ref $stanza eq "ARRAY" ) {
-+ if ($msg ne '') {
-+ $wrapfunc->($msg);
-+</%perl>
-+<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre></font>
-+<%perl>
-+ $msg = '';
-+ }
-+ $m->comp( 'ShowMessageStanza',
-+ Depth => $Depth + 1,
-+ Transaction => $Transaction,
-+ Message => $stanza );
-+ }
-+ elsif ( ref $stanza eq "HASH" ) {
-+ $msg .= "$stanza->{raw}\n";
-+ }
- }
- elsif ( ref $stanza eq "HASH" ) {
- my $content = $stanza->{raw};
Index: lib/RT/Attachment_Overlay.pm
---- lib/RT/Attachment_Overlay.pm.orig 2007-04-24 19:21:42 +0200
-+++ lib/RT/Attachment_Overlay.pm 2007-07-06 09:24:49 +0200
-@@ -297,10 +297,12 @@
- eval {return( Encode::decode_utf8($content))} || return ($content);
- }
-
-+ if (!$enc) {
- eval { Encode::from_to($content, 'utf8' => $enc) } if $enc;
- if ($@) {
- $RT::Logger->error("Could not convert attachment from assumed utf8 to
'$enc' :".$@);
- }
-+ }
- return $content;
+--- lib/RT/Attachment_Overlay.pm.orig 2009-06-10 20:40:33 +0200
++++ lib/RT/Attachment_Overlay.pm 2009-08-07 16:57:05 +0200
+@@ -313,10 +313,12 @@
+ eval { return( Encode::decode_utf8($content)) } || return
($content);
+ }
+
++ if (!$enc) {
+ eval { Encode::from_to($content, 'utf8' => $enc) } if $enc;
+ if ($@) {
+ $RT::Logger->error("Could not convert attachment from assumed utf8
to '$enc' :".$@);
+ }
++ }
+ return $content;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.spec
============================================================================
$ cvs diff -u -r1.202 -r1.203 rt.spec
--- openpkg-src/rt/rt.spec 11 Jun 2009 08:33:01 -0000 1.202
+++ openpkg-src/rt/rt.spec 7 Aug 2009 17:13:09 -0000 1.203
@@ -41,7 +41,7 @@
Group: Ticketing
License: GPL
Version: %{V_rt}
-Release: 20090611
+Release: 20090807
# package options
%option with_db_sqlite no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
