commit 1a04206a9a336dcce4a1ea3ac23f3240519d77de
Author: Ralf CorsÃpius <corsepiu@xxxxxxxxxxxxxxxxx>
Date: Sat Apr 16 07:17:01 2011 +0200
Upstream update.
Rebase patches.
Spec cleanup.
.gitignore | 1 +
rt-3.8.9-Makefile.diff => rt-3.8.10-Makefile.diff | 6 +++---
rt-3.8.9-config.diff => rt-3.8.10-config.diff | 6 +++---
rt-3.8.10-test-dependencies.diff | 11 +++++++++++
rt-3.8.9-test-dependencies.diff | 11 -----------
rt3.spec | 12 ++++++------
sources | 2 +-
7 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe59dfd..26c5be3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
rt-3.8.8.tar.gz
/rt-3.8.9.tar.gz
+/rt-3.8.10.tar.gz
diff --git a/rt-3.8.9-Makefile.diff b/rt-3.8.10-Makefile.diff
similarity index 88%
rename from rt-3.8.9-Makefile.diff
rename to rt-3.8.10-Makefile.diff
index 0245e58..7bd2d8e 100644
--- a/rt-3.8.9-Makefile.diff
+++ b/rt-3.8.10-Makefile.diff
@@ -1,6 +1,6 @@
-diff -Naur rt-3.8.9.orig/Makefile.in rt-3.8.9/Makefile.in
---- rt-3.8.9.orig/Makefile.in 2011-02-15 22:58:29.000000000 +0100
-+++ rt-3.8.9/Makefile.in 2011-02-17 09:26:50.481479851 +0100
+diff -Naur rt-3.8.10.orig/Makefile.in rt-3.8.10/Makefile.in
+--- rt-3.8.10.orig/Makefile.in 2011-02-15 22:58:29.000000000 +0100
++++ rt-3.8.10/Makefile.in 2011-02-17 09:26:50.481479851 +0100
@@ -287,7 +287,7 @@
@echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
diff --git a/rt-3.8.9-config.diff b/rt-3.8.10-config.diff
similarity index 71%
rename from rt-3.8.9-config.diff
rename to rt-3.8.10-config.diff
index e2810cb..733d3db 100644
--- a/rt-3.8.9-config.diff
+++ b/rt-3.8.10-config.diff
@@ -1,6 +1,6 @@
-diff -Naur rt-3.8.9.orig/etc/RT_SiteConfig.pm rt-3.8.9/etc/RT_SiteConfig.pm
---- rt-3.8.9.orig/etc/RT_SiteConfig.pm 2011-02-15 22:58:29.000000000 +0100
-+++ rt-3.8.9/etc/RT_SiteConfig.pm 2011-02-17 09:24:40.701587430 +0100
+diff -Naur rt-3.8.10.orig/etc/RT_SiteConfig.pm rt-3.8.10/etc/RT_SiteConfig.pm
+--- rt-3.8.10.orig/etc/RT_SiteConfig.pm 2011-02-15 22:58:29.000000000 +0100
++++ rt-3.8.10/etc/RT_SiteConfig.pm 2011-02-17 09:24:40.701587430 +0100
@@ -12,8 +12,19 @@
# going to run into trouble. To check your SiteConfig file, use
# this comamnd:
diff --git a/rt-3.8.10-test-dependencies.diff b/rt-3.8.10-test-dependencies.diff
new file mode 100644
index 0000000..becc5ed
--- /dev/null
+++ b/rt-3.8.10-test-dependencies.diff
@@ -0,0 +1,11 @@
+diff -Naur rt-3.8.10.orig/sbin/rt-test-dependencies.in rt-3.8.10/sbin/rt-test-dependencies.in
+--- rt-3.8.10.orig/sbin/rt-test-dependencies.in 2011-02-15 22:58:29.000000000 +0100
++++ rt-3.8.10/sbin/rt-test-dependencies.in 2011-02-17 09:29:01.437394526 +0100
+@@ -281,7 +281,6 @@
+
+ $deps{'DEV'} = [ text_to_hash( << '.') ];
+ HTML::Form
+-HTML::TokeParser
+ WWW::Mechanize
+ Test::WWW::Mechanize 1.04
+ Module::Refresh 0.03
diff --git a/rt3.spec b/rt3.spec
index 52f34f1..f718ee6 100644
--- a/rt3.spec
+++ b/rt3.spec
@@ -39,7 +39,7 @@
%define RT3_LOCALSTATEDIR %{_localstatedir}/lib/rt3
Name: rt3
-Version: 3.8.9
+Version: 3.8.10
Release: 1%{?dist}
Summary: Request tracker 3
@@ -56,7 +56,6 @@ Patch2: rt-%{version}-Makefile.diff
Patch3: rt-%{version}-test-dependencies.diff
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# For Debian compatibility
Provides: request-tracker3 = %{version}-%{release}
@@ -319,7 +318,6 @@ make %{?_smp_mflags}
/usr/bin/pod2man bin/mason_handler.fcgi > bin/mason_handler.fcgi.1
%install
-rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
# Cleanup the mess rt's configuration leaves behind
@@ -389,9 +387,6 @@ find ${RPM_BUILD_ROOT}%{RT3_WWWDIR} \
# - Require packages which are n/a in Fedora
%{?with_tests:make test}
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%postun
if [ $1 -eq 0 ]; then
/bin/rm -rf %{RT3_CACHEDIR}
@@ -450,6 +445,11 @@ fi
%endif
%changelog
+* Sat Apr 16 2011 Ralf CorsÃpius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.10-1
+- Upstream update.
+- Rebase patches.
+- Spec cleanup.
+
* Thu Feb 17 2011 Ralf CorsÃpius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.9-1
- Upstream update (CVE-2011-0009, BZ 672257).
- Rebase patches.
diff --git a/sources b/sources
index a7216de..4dd89ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b4e2aac02f0c18d96337ec84891d760 rt-3.8.9.tar.gz
+00c147d71476d032d33dbad76bdc06ff rt-3.8.10.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
