Forráskód Böngészése

upgrading package: rt 3.0.4 -> 3.0.5

Michael Schloh von Bennewitz 22 éve
szülő
commit
d4fee0c16a
2 módosított fájl, 20 hozzáadás és 23 törlés
  1. 16 19
      rt/rt.patch
  2. 4 4
      rt/rt.spec

+ 16 - 19
rt/rt.patch

@@ -1,17 +1,9 @@
---- lib/RT/User_Overlay.pm.dist	2003-08-05 16:22:34.000000000 +0200
-+++ lib/RT/User_Overlay.pm	2003-08-05 16:29:17.000000000 +0200
-@@ -203,7 +203,6 @@
-         @_    # get the real argumentlist
-     );
- 
--
-     $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
- 
-     #Check the ACL
-@@ -274,7 +273,7 @@
- 
+--- lib/RT/User_Overlay.pm.dist	Tue Sep  9 17:16:16 2003
++++ lib/RT/User_Overlay.pm	Tue Sep  9 17:18:24 2003
+@@ -279,7 +279,7 @@
      #If the create failed.
      unless ($id) {
+         $RT::Handle->Rollback();
 -        $RT::Logger->error("Could not create a new user - " .join('-'. %args));
 +        $RT::Logger->error("Could not create a new user - " .join('-', %args));
  
@@ -121,16 +113,21 @@
  <%ARGS>
  $user => ""
  $pass => undef
---- lib/RT/Attachment_Overlay.pm.dist	2003-08-06 13:01:15.000000000 +0200
-+++ lib/RT/Attachment_Overlay.pm	2003-08-06 13:01:32.000000000 +0200
-@@ -313,7 +313,9 @@
+--- lib/RT/Attachment_Overlay.pm.dist	2003-09-08 20:18:38.000000000 +0200
++++ lib/RT/Attachment_Overlay.pm	2003-09-09 17:28:52.000000000 +0200
+@@ -318,10 +318,11 @@
      # If we somehow fail to do the decode, at least push out the raw bits
      eval {return( Encode::decode_utf8($content))} || return ($content);
    }
--  Encode::from_to($content, 'utf8' => $enc);
+-  
+-  eval { Encode::from_to($content, 'utf8' => $enc);};
+-  if ($@) {
+-	$RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
 +  if (!$enc) {
-+    eval {Encode::from_to($content, 'utf8' => $enc);}
-+  }
++    eval { Encode::from_to($content, 'utf8' => $enc);};
++    if ($@) {
++	  $RT::Logger->error("Could not convert attachment from assumed utf8 to '$enc' :".$@);
++    }
+   }
    return $content;
  }
- 

+ 4 - 4
rt/rt.spec

@@ -26,10 +26,10 @@
 #   FIXME: rse: Error: MM: mm:core: failed to open semaphore file (Permission denied): OS: No such file or directory
 
 #   package versions
-%define       V_real                       3-0-4
-%define       V_here                       3.0.4
+%define       V_real                       3-0-5
+%define       V_here                       3.0.5
 %define       V_log_dispatch               2.04
-%define       V_html_mason                 1.22
+%define       V_html_mason                 1.23
 %define       V_libapreq                   1.1
 %define       V_www_mechanize              0.59
 %define       V_mldbm                      2.01
@@ -49,7 +49,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Database
 License:      GPL
 Version:      %{V_here}
-Release:      20030904
+Release:      20030909
 
 #   package options
 %option       with_color_primary   336699