- up to 4.2.11

diff --git a/content-id.patch b/content-id.patch
deleted file mode 100644 (file)
index af687cd..0000000
--- a/content-id.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d2e519d4ed50ccc8f44b66b814f47de5ff63d0cc Mon Sep 17 00:00:00 2001
-From: Przemyslaw Plewa <przemyslaw.plewa@domena.pl>
-Date: Fri, 6 Feb 2015 13:50:11 +0100
-Subject: [PATCH] Use Content-ID when handling multipart message over REST.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Record Content-ID identifier that came over REST API.
-
-This allows us to have multipart messages with one (or more) part
-refering to other parts of message. Content-ID identifier is used for
-reference.
-
-Such message also needs multipart/related type (instead of default (in
-rt) multipart/mixed. So if we detect Content-ID in any part of multipart
-message we switch Content-Type to multipart/related.
-
-Signed-off-by: Przemysław Plewa <przemyslaw.plewa@domena.pl>
----
- lib/RT/Interface/REST.pm | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lib/RT/Interface/REST.pm b/lib/RT/Interface/REST.pm
-index edfc5d3..1c8f555 100644
---- a/lib/RT/Interface/REST.pm
-+++ b/lib/RT/Interface/REST.pm
-@@ -324,11 +324,17 @@ sub process_attachments {
-         }
- 
-         my $info = $cgi->uploadInfo($fh);
-+        # If Content-ID exists for attachment then we need multipart/related
-+        # to be able to refer to this Content-Id in core of mime message
-+        if($info->{'Content-ID'}) {
-+            $entity->head->set('Content-Type', 'multipart/related');
-+        }
-         my $new_entity = $entity->attach(
-             Path => $tmp_fn,
-             Type => $info->{'Content-Type'} || guess_media_type($tmp_fn),
-             Filename => $file,
-             Disposition => $info->{'Content-Disposition'} || "attachment",
-+            'Content-ID' => $info->{'Content-ID'},
-         );
-         $new_entity->bodyhandle->{'_dirty_hack_to_save_a_ref_tmp_fh'} = $tmp_fh;
-         $i++;
--- 
-2.3.0
-

diff --git a/rt.spec b/rt.spec
index 9597633843b65fec2215870faa219272e4af85b8..2ccc1d45b440621622af172a56fe0498a7fdb201 100644 (file)
--- a/rt.spec
+++ b/rt.spec
@@ -44,12 +44,12 @@
 Summary:       Request Tracker
 Summary(pl.UTF-8):     Request Tracker - system do śledzenia zleceń
 Name:          rt
-Version:       4.2.10
-Release:       2
+Version:       4.2.11
+Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://download.bestpractical.com/pub/rt/release/%{name}-%{version}.tar.gz
-# Source0-md5: 077f3ed99d36eb744fe25c2bfd70e996
+# Source0-md5: f0b02b2f97ff346ca2d57a17b136b9d0
 Source1:       %{name}-apache_dir.conf
 Source2:       %{name}-apache_vhost.conf
 Source3:       %{name}-apache.conf
@@ -57,7 +57,6 @@ Source4:      %{name}.logrotate
 Source5:       lighttpd.conf
 Patch0:                %{name}-layout.patch
 Patch1:                %{name}-config.patch
-Patch2:                content-id.patch
 URL:           http://www.bestpractical.com/rt/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -190,7 +189,7 @@ Requires:   perl-Devel-GlobalDestruction
 Requires:      perl-Devel-StackTrace >= %{perl_devel_stacktrace_ver}
 Requires:      perl-Digest-MD5 >= %{perl_digest_md5_ver}
 Requires:      perl-Email-Address-List
-Requires:      perl-Encode >= 2.64
+Requires:      perl-Encode >= 1:2.64
 Requires:      perl-FCGI-ProcManager
 Requires:      perl-File-Which
 Requires:      perl-GD >= %{perl_gd_ver}
@@ -305,7 +304,6 @@ Pliki wspomagające używanie RT z Apache.
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 mv aclocal.m4 acinclude.m4