- rel 2; fix perl 5.26 warning which rt treats as error

diff --git a/rt-perl.patch b/rt-perl.patch
new file mode 100644 (file)
index 0000000..619c9a7
--- /dev/null
+++ b/rt-perl.patch
@@ -0,0 +1,19 @@
+commit 971daa20cf2e05d3829217e868acae034296a912
+Author: Dominic Hargreaves <dom@earth.li>
+Date:   Mon Jun 19 19:29:42 2017 +0100
+
+    Fix "Unescaped left brace in regex" warning in perl 5.26
+
+diff --git a/share/html/Search/Elements/EditSort b/share/html/Search/Elements/EditSort
+index 4ab08002f..4853e17f2 100644
+--- a/share/html/Search/Elements/EditSort
++++ b/share/html/Search/Elements/EditSort
+@@ -119,7 +119,7 @@ $fields{$_} = $_ for @cfs;
+ # Add all available CustomRoles to the list of sortable columns.
+ my @roles = grep /^CustomRole/, @{$ARGS{AvailableColumns}};
+ for my $role (@roles) {
+-    my ($label) = $role =~ /^CustomRole.{(.*)}$/;
++    my ($label) = $role =~ /^CustomRole.\{(.*)\}$/;
+     my $value = $role;
+     $fields{$label . '.EmailAddress' } = $value . '.EmailAddress';
+ }

diff --git a/rt.spec b/rt.spec
index ad379781f718e8d931070f20b882d89c419fedd9..42c2bb46e6b18325bb0fc1a31cdc5a2e01fe6fe0 100644 (file)
--- a/rt.spec
+++ b/rt.spec
@@ -45,7 +45,7 @@ Summary:      Request Tracker
 Summary(pl.UTF-8):     Request Tracker - system do śledzenia zleceń
 Name:          rt
 Version:       4.4.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications
 Source0:       http://download.bestpractical.com/pub/rt/release/%{name}-%{version}.tar.gz
@@ -57,6 +57,7 @@ Source4:      %{name}.logrotate
 Source5:       lighttpd.conf
 Patch0:                %{name}-layout.patch
 Patch1:                %{name}-config.patch
+Patch2:                %{name}-perl.patch
 URL:           http://www.bestpractical.com/rt/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -319,6 +320,7 @@ Pliki wspomagające używanie RT z Apache.
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 mv aclocal.m4 acinclude.m4