[rt] Update to 4.2.10.

Tue Mar 10 00:08:15 UTC 2015

commit f84f971f8140fca6fb8661ee4e830fb2c07bb159
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Mon Mar 9 19:08:02 2015 -0500

    Update to 4.2.10.

 0001-Remove-configure-time-generated-files.patch   | 16719 -------------------
 ...-usr-bin-perl-instead-of-usr-bin-env-perl.patch |    33 -
 0007-Fix-translation.patch                         |    14 +-
 0008-Adjust-path-to-html-autohandler.patch         |    24 -
 0009-Work-around-testsuite-failure.patch           |    47 -
 rt.spec                                            |    73 +-
 6 files changed, 62 insertions(+), 16848 deletions(-)
---

diff --git a/0004-Use-usr-bin-perl-instead-of-usr-bin-env-perl.patch b/0004-Use-usr-bin-perl-instead-of-usr-bin-env-perl.patch
index abec54f..e6d893b 100644
--- a/0004-Use-usr-bin-perl-instead-of-usr-bin-env-perl.patch
+++ b/0004-Use-usr-bin-perl-instead-of-usr-bin-env-perl.patch
@@ -12,9 +12,6 @@ Subject: [PATCH 4/8] Use /usr/bin/perl instead of /usr/bin/env perl.
  devel/tools/rt-attributes-editor         | 2 +-
  devel/tools/rt-static-docs               | 2 +-
  devel/tools/tweak-template-locstring     | 2 +-
- etc/upgrade/shrink_cgm_table.pl          | 2 +-
- etc/upgrade/shrink_transactions_table.pl | 2 +-
- etc/upgrade/time-worked-history.pl       | 2 +-
  etc/upgrade/upgrade-mysql-schema.pl      | 2 +-
  lib/RT/Interface/Web/QueryBuilder.pm     | 1 +
  t/mail/fake-sendmail                     | 2 +-
@@ -100,36 +97,6 @@ index ca44d39..b31570b 100755
  # BEGIN BPS TAGGED BLOCK {{{
  #
  # COPYRIGHT:
-diff --git a/etc/upgrade/shrink_cgm_table.pl b/etc/upgrade/shrink_cgm_table.pl
-index 7157b20..02f5555 100644
---- a/etc/upgrade/shrink_cgm_table.pl
-+++ b/etc/upgrade/shrink_cgm_table.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # BEGIN BPS TAGGED BLOCK {{{
- #
- # COPYRIGHT:
-diff --git a/etc/upgrade/shrink_transactions_table.pl b/etc/upgrade/shrink_transactions_table.pl
-index 0b78f0f..026a863 100644
---- a/etc/upgrade/shrink_transactions_table.pl
-+++ b/etc/upgrade/shrink_transactions_table.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # BEGIN BPS TAGGED BLOCK {{{
- #
- # COPYRIGHT:
-diff --git a/etc/upgrade/time-worked-history.pl b/etc/upgrade/time-worked-history.pl
-index 46961aa..666498e 100644
---- a/etc/upgrade/time-worked-history.pl
-+++ b/etc/upgrade/time-worked-history.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # BEGIN BPS TAGGED BLOCK {{{
- #
- # COPYRIGHT:
 diff --git a/etc/upgrade/upgrade-mysql-schema.pl b/etc/upgrade/upgrade-mysql-schema.pl
 index 8d6615d..204676c 100755
 --- a/etc/upgrade/upgrade-mysql-schema.pl
diff --git a/0007-Fix-translation.patch b/0007-Fix-translation.patch
index 7f093b8..790bdca 100644
--- a/0007-Fix-translation.patch
+++ b/0007-Fix-translation.patch
@@ -7,19 +7,15 @@ Subject: [PATCH 7/8] Fix translation.
  share/po/de.po | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/share/po/de.po b/share/po/de.po
-index 0eaf1e7..a952f0a 100644
---- a/share/po/de.po
-+++ b/share/po/de.po
-@@ -1002,7 +1002,7 @@ msgstr "Alle Tickets"
+diff -up ./share/po/de.po.orig ./share/po/de.po
+--- ./share/po/de.po.orig	2015-02-25 15:30:21.000000000 -0600
++++ ./share/po/de.po	2015-03-09 13:54:09.094706168 -0500
+@@ -1006,7 +1006,7 @@ msgstr "Alle Tickets"
  
- #: share/html/User/Prefs.html:171
+ #: share/html/User/Prefs.html:173
  msgid "All iCal feeds embed a secret token which authorizes you.  If the URL for one of your iCal feeds was exposed to the outside world, you can get a new secret, <b>breaking all existing iCal feeds</b>, below."
 -msgstr "Alle iCal-Feeds beinhalten einen geheimen Token durch welchen die Authorisierung erfolgt. Falls die URL für einen dieser iCal-Feeds irrtümlich nach Extern weitergegeben wurde, können Sie unterhalb einen neuen Token erstellen, welcher <b>alle exestierenden iCal-Feeds</b> ungültig werden lässt."
 +msgstr "Alle iCal-Feeds beinhalten einen geheimen Token durch welchen die Authorisierung erfolgt. Falls die URL für einen dieser iCal-Feeds irrtümlich nach Extern weitergegeben wurde, können Sie unterhalb einen neuen Token erstellen, welcher <b>alle existierenden iCal-Feeds</b> ungültig werden lässt."
  
  #: share/html/Admin/Queues/index.html:99
  msgid "All queues matching search criteria"
--- 
-2.1.0
-
diff --git a/rt.spec b/rt.spec
index 96a88a7..ec5a640 100644
--- a/rt.spec
+++ b/rt.spec
@@ -38,8 +38,8 @@
 %global RT_STATICDIR		%{_datadir}/%{name}/static
 
 Name:		rt
-Version:	4.2.9
-Release:	2%{?dist}
+Version:	4.2.10
+Release:	1%{?dist}
 Summary:	Request tracker
 
 Group:		Applications/Internet
@@ -55,15 +55,12 @@ Source3:	README.fedora.in
 # rt's logrotate configuration
 Source4:	rt.logrotate.in
 
-Patch1: 0001-Remove-configure-time-generated-files.patch
 Patch2: 0002-Add-Fedora-configuration.patch
 Patch3: 0003-Broken-test-dependencies.patch
 Patch4: 0004-Use-usr-bin-perl-instead-of-usr-bin-env-perl.patch
-Patch5:	0005-Remove-fixperms-font-install.patch
+Patch5: 0005-Remove-fixperms-font-install.patch
 Patch6: 0006-Fix-permissions.patch
 Patch7: 0007-Fix-translation.patch
-Patch8: 0008-Adjust-path-to-html-autohandler.patch
-Patch9: 0009-Work-around-testsuite-failure.patch
 
 BuildArch:	noarch
 
@@ -352,15 +349,49 @@ sed -e 's, at RT_CACHEDIR@,%{RT_CACHEDIR},' %{SOURCE3} \
 sed -e 's, at RT_LOGDIR@,%{RT_LOGDIR},' %{SOURCE4} \
   > rt.logrotate
 
-%patch1 -p1
+# Remove configure-time generated files
+rm Makefile
+rm bin/rt
+rm bin/rt-crontool
+rm bin/rt-mailgate
+rm etc/RT_Config.pm
+rm etc/upgrade/3.8-ical-extension
+rm etc/upgrade/4.0-customfield-checkbox-extension
+rm etc/upgrade/generate-rtaddressregexp
+rm etc/upgrade/split-out-cf-categories
+rm etc/upgrade/switch-templates-to
+rm etc/upgrade/upgrade-articles
+rm etc/upgrade/vulnerable-passwords
+rm lib/RT/Generated.pm
+rm sbin/rt-attributes-viewer
+rm sbin/rt-clean-sessions
+rm sbin/rt-dump-metadata
+rm sbin/rt-email-dashboards
+rm sbin/rt-email-digest
+rm sbin/rt-email-group-admin
+rm sbin/rt-fulltext-indexer
+rm sbin/rt-importer
+rm sbin/rt-preferences-viewer
+rm sbin/rt-serializer
+rm sbin/rt-server
+rm sbin/rt-server.fcgi
+rm sbin/rt-session-viewer
+rm sbin/rt-setup-database
+rm sbin/rt-setup-fulltext-index
+rm sbin/rt-shredder
+rm sbin/rt-test-dependencies
+rm sbin/rt-validate-aliases
+rm sbin/rt-validator
+rm sbin/standalone_httpd
+rm t/data/configs/apache2.2+fastcgi.conf
+rm t/data/configs/apache2.2+mod_perl.conf
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 # Propagate rpm's directories to config.layout
 cat << \EOF >> config.layout
@@ -501,16 +532,17 @@ find ${RPM_BUILD_ROOT}%{RT_WWWDIR} \
 # Silence rpmlint
 chmod a+x \
 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/3.8-ical-extension \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/upgrade-articles \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/4.0-customfield-checkbox-extension \
 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/generate-rtaddressregexp \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/shrink_transactions_table.pl \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/sanity-check-stylesheets \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/shrink-cgm-table \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/shrink-transactions-table \
 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/split-out-cf-categories \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/4.0-customfield-checkbox-extension \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/vulnerable-passwords \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/upgrade-mysql-schema.pl \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/shrink_cgm_table.pl \
 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/switch-templates-to \
-${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/time-worked-history.pl
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/time-worked-history \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/upgrade-articles \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/upgrade-mysql-schema.pl \
+${RPM_BUILD_ROOT}%{_datadir}/%{name}/upgrade/vulnerable-passwords
 
 %check
 # The tests don't work in buildroots, they
@@ -589,6 +621,15 @@ fi
 %endif
 
 %changelog
+* Mon Mar 09 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 4.2.10-1
+- Update to 4.2.10.
+- Remove 0001-Remove-configure-time-generated-files.patch and delete the files
+  directly instead; the patch would require a complete rebase any time any of
+  those files changes.
+- Remove 0008-Adjust-path-to-html-autohandler.patch and
+  0009-Work-around-testsuite-failure.patch as they have been upstreamed.
+- Adjust to new filenames in /usr/share/rt/upgrade.
+
 * Tue Jan 27 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 4.2.9-2
 - Remove --with/without gpg.
 - Remove --with/without gd.
