[rt3/el6: 17/17] merge with Fedora master (3.8.13)

[Xavier Bachelot]

commit 38cb08bc331c2bc82af60e161db4fbc0c93adf6e
Merge: fa04589 395eb05
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Mon Jun 4 23:42:31 2012 +0200

    merge with Fedora master (3.8.13)

 .gitignore                                         |    5 +-
 README.tests                                       |   12 +
 rt-3.8.10-Makefile.diff => rt-3.8.11-Makefile.diff |    0
 rt-3.8.10-config.diff => rt-3.8.11-config.diff     |    0
 rt-3.8.11-shebang.diff                             |  360 ++++++++++++++++++++
 ...encies.diff => rt-3.8.11-test-dependencies.diff |    0
 rt3.spec                                           |  225 +++++++++----
 sources                                            |    2 +-
 8 files changed, 539 insertions(+), 65 deletions(-)
---
diff --cc rt3.spec
index 00bfeb8,3b4aa32..1680605
--- a/rt3.spec
+++ b/rt3.spec
@@@ -19,28 -19,29 +19,33 @@@
  # --with devel_mode/--without devel_mode
  #	enable/disable building/installing devel files
  #	Default: --with
++%if 0%{?fedora}
  %bcond_without devel_mode
++%else
++%bcond_with devel_mode
++%endif
  
  # --with gpg/--without gpg
  #	enable/disable building gpg support
  #	Default: --without
  %bcond_with gpg
  
- # --with tests
+ # --with runtests
  #	run testsuite when building the rpm
  #	Default: without (doesn't work in chroots.)
- %bcond_with tests
+ %bcond_with runtests
  
- %define RT3_BINDIR		%{_sbindir}
- %define RT3_LIBDIR		%{perl_vendorlib}
- %define RT3_WWWDIR		%{_datadir}/rt3/html
- %define RT3_LOGDIR		%{_localstatedir}/log/rt3
- %define RT3_CACHEDIR		%{_localstatedir}/cache/rt3
- %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
+ %global RT3_BINDIR		%{_sbindir}
+ %global RT3_LIBDIR		%{perl_vendorlib}
+ %global RT3_WWWDIR		%{_datadir}/rt3/html
+ %global RT3_LEXDIR		%{_datadir}/rt3/po
+ %global RT3_LOGDIR		%{_localstatedir}/log/rt3
+ %global RT3_CACHEDIR		%{_localstatedir}/cache/rt3
+ %global RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
  
  Name:		rt3
- Version:	3.8.10
- Release:	2%{?dist}.1
+ Version:	3.8.13
 -Release:	1%{?dist}
++Release:	1%{?dist}.1
  Summary:	Request tracker 3
  
  Group:		Applications/Internet
@@@ -448,9 -495,55 +499,61 @@@ f
  %endif
  
  %changelog
++* Mon Jun 04 2012 Xavier Bachelot <xavier at bachelot.org> - 3.8.13-1.1
++- Default to non-devel mode for non-Fedora builds.
++
+ * Sat Jun 02 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.13-1
+ - Upstream update.
+ 
+ * Tue May 22 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.12-1
+ - Upstream update.
+ - Address various CVEs (BZ 824082).
+ 
+ * Tue Feb 02 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-7
+ - Fix shebangs.
+ - Make testsuite files executable (enables rpm's perl module dep tracking).
+ - Build *-tests, iff devel_mode was given.
+ - Misc. specfile massaging.
+ 
+ * Tue Jan 31 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-6
+ - Misc. specfile improvements.
+ 
+ * Tue Jan 31 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-5
+ - Rewrite *-tests package (Don't use tests macros).
+ 
+ * Mon Jan 30 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-4
+ - Rename rpmbuild option with_tests into with_runtests.
+ - Add rt3-tests subpackage.
+ - Add README.tests.
+ - Remove removal of ${RT3_LIBDIR}/t (Fixed by upstream).
+ - Rework R:/BR:.
+ - Use %%{__rm} instead of /bin/rm.
+ - Misc minor spec file cleanup.
+ 
+ * Wed Jan 18 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-3
+ - Fix typo in filter rules.
+ - Add lexdir, manualdir, RT3_LEXDIR.
+ 
+ * Mon Jan 16 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-2
+ - Remove redundant R: config(rt3), Remove P: config(rt3).
+ - Rewrite filter rules.
+ 
+ * Sun Jan 15 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.11-1
+ - Upstream update.
+ 
+ * Tue Jan 10 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.10-5
+ - Fix broken dependency filtering having been added in *-4.
+ - Spec file cleanup.
+ 
+ * Mon Jul 25 2011 Petr Pisar <ppisar at redhat.com> - 3.8.10-4
+ - RPM 4.9 dependency filtering added
+ 
+ * Wed Jul 20 2011 Petr Sabata <contyk at redhat.com> - 3.8.10-3
+ - Perl mass rebuild
+ 
 +* Tue May 03 2011 Xavier Bachelot <xavier at bachelot.org> - 3.8.10-2.1
 +- Add BR: perl(Digest::SHA).
 +
  * Sat Apr 16 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.8.10-2
  - Work-around rpm's depgenerator defect: 
    Filter Requires: perl(DBIx::SearchBuilder::Handle::).