From 43920651b662dfa84efc711e7a86c3fcf33dac78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Tue, 4 Aug 2015 06:27:29 +0200
Subject: Install README* directy into %_pkgdocdir (Work-around regression
introduced
by rpm-4.12.90 (RHBZ#1249716).
diff --git a/rt.spec b/rt.spec
index 4c95f6d..c430712 100644
--- a/rt.spec
+++ b/rt.spec
@@ -39,7 +39,7 @@
Name: rt
Version: 4.2.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Request tracker
Group: Applications/Internet
@@ -440,6 +440,11 @@ done
%install
make install DESTDIR=${RPM_BUILD_ROOT}
+# Work-around to regression in rpm >= 4.12.90:
+# Can't mix %%doc with directly installed docs, anymore.
+# Need to install all files directly.
+install -m 644 README README.fedora ${RPM_BUILD_ROOT}%{_pkgdocdir}
+
# We don't want CPAN
rm -f ${RPM_BUILD_ROOT}%{_sbindir}/rt-test-dependencies
@@ -528,7 +533,7 @@ fi
%files
-%doc README README.fedora
+%{_pkgdocdir}
%license COPYING
%{_bindir}/*
%{_sbindir}/*
@@ -591,6 +596,10 @@ fi
%endif
%changelog
+* Tue Aug 04 2015 Ralf Corsépius - 4.2.11-2
+- Install README* directy into %_pkgdocdir (Work-around regression introduced
+ by rpm-4.12.90 (RHBZ#1249716).
+
* Wed Jun 17 2015 Ralf Corsépius - 4.2.11-1
- Update to 4.2.11.
- Rebase patches.
--
cgit v0.10.2
From cf5101ce3e97b2d9bab421357ecd941497bd77bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Mon, 17 Aug 2015 13:19:05 +0200
Subject: Update to rt-4.2.12.
- Rebase 0001-Remove-configure-time-generated-files.patch.
diff --git a/0001-Remove-configure-time-generated-files.patch
b/0001-Remove-configure-time-generated-files.patch
index 3ff7e7a..fe66f27 100644
--- a/0001-Remove-configure-time-generated-files.patch
+++ b/0001-Remove-configure-time-generated-files.patch
@@ -1,4 +1,4 @@
-From 3606668019fe072aef0cc98b0f01bedc7b1ab9de Mon Sep 17 00:00:00 2001
+From 8530f61cf636ccdd9c181ae83a501ae114275f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Tue, 18 Mar 2014 07:23:24 +0100
Subject: [PATCH 1/7] Remove configure time generated files.
@@ -86,7 +86,7 @@ Subject: [PATCH 1/7] Remove configure time generated files.
diff --git a/Makefile b/Makefile
deleted file mode 100644
-index 90c2c1d..000
+index 1f2bda7..000
--- a/Makefile
+++ /dev/null
@@ -1,583 +0,0 @@
@@ -156,7 +156,7 @@ index 90c2c1d..000
-
-RT_VERSION_MAJOR = 4
-RT_VERSION_MINOR = 2
--RT_VERSION_PATCH = 11
+-RT_VERSION_PATCH = 12
-
-RT_VERSION=
$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
-TAG =
rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
@@ -3820,7 +3820,7 @@ index f793250..000
-
diff --git a/bin/rt-mailgate b/bin/rt-mailgate
deleted file mode 100755
-index 365f4da..000
+index dbc95c0..000
--- a/bin/rt-mailgate
+++ /dev/null
@@ -1,512 +0,0 @@
@@ -3977,7 +3977,7 @@ index 365f4da..000
-my $self = shift;
-my $opts = shift;
-my $ua = LWP::UserAgent->new();
--$ua->agent("rt-mailgate/4.2.11 ");
+-$ua->agent("rt-mailgate/4.2.12 ");
-$ua->cookie_jar( { file => $opts->{'jar'} } ) if $opts->{'jar'};
-
-$ua->ssl_opts( verify_hostname => $opts->{'verify-ssl'} );
@@ -8908,7 +8908,7 @@ index c7616e9..000
-}
diff --git a/lib/RT/Generated.pm b/lib/RT/Generated.pm
deleted file mode 100644
-index 122a465..000
+index e3b92f7..000
--- a/lib/RT/Generated.pm
+++ /dev/null
@@ -1,85 +0,0 @@
@@ -8964,7 +8964,7 @@ index 122a465..000
-use warnings;
-use strict;
-
--our $VERSION = '4.2.11';
+-our $VERSION = '4.2.12';
-our ($MAJOR_VERSION, $MINOR_VERSION, $REVISION) = $VERSION =~
/^(\d)\.(\d)\.(\d+)/;
-
-
@@ -14322,7 +14322,7 @@ index 721efea..000
-exit(0);
diff --git a/sbin/rt-test-dependencies b/sbin/rt-test-dependencies
deleted file mode 100755
-index 9b7c895..000
+index 5d96d0e..000
--- a/sbin/rt-test-dependencies
+++ /dev/null
@@ -1,680 +0,0 @@
@@ -14426,8 +14426,8 @@ index 9b7c895..000
-'with-GPG' => 1,
-'with-SMIME' => 1,
-'with-ICAL' => 1,
--'with-GRAPHVIZ' => 1,
--'with-GD' => 1,
+-'with-GRAPHVIZ' => 0,
+-'with-GD' => 0,
-'with-DASHBOARDS' => 1,
-'with-USERLOGO' => 1,
-'with-HTML-DOC' => 0,
@@ -17169,5 +17169,5 @@ index a17d68d..000
-
-
--
-2.1.0
+2.4.3
diff --git a/rt.spec b/rt.spec
index c430712..cf3e1f4 100644
--- a/rt.spec
+++ b/rt.spec
@@ -38,8 +38,8 @@
%global RT_STATICDIR %{_datadir}/%{name}/static
Name: rt
-Version: 4.2.11
-Release: 2%{?dist}
+Version: 4.2.12
+Release: 1%{?dist}
Summary: Request tracker
Group: Applications/Internet
@@ -596,6 +596,10 @@ fi
%endif
%changelog
+* Mon Aug 17 2015 Ralf Corsépius - 4.2.12-1
+- Update to rt-4.2.12.
+- Rebase 0001-Remove-configure-time-generated-files.patch.
+
* Tue