[rt3] Misc. specfile improvements.

corsepiu corsepiu at fedoraproject.org
Tue Jan 31 14:54:33 UTC 2012


commit 271bb9e69546c332b8da2e21b34cef7161ad816f
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Jan 31 15:54:24 2012 +0100

    Misc. specfile improvements.

 rt3.spec |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/rt3.spec b/rt3.spec
index d7e3d78..f4eb88f 100644
--- a/rt3.spec
+++ b/rt3.spec
@@ -41,7 +41,7 @@
 
 Name:		rt3
 Version:	3.8.11
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -238,14 +238,16 @@ Summary:	Test suite for package rt3
 Group:		Development/Debug
 Requires:	%{name} = %{version}-%{release}
 Requires:	/usr/bin/prove
+Requires(postun): %{__rm}
 Requires:	perl(DBD::SQLite)
 Requires:	perl(HTML::Mason::Compiler)
 Requires:	perl(HTML::Mason::Compiler::ToObject)
-Requires:	perl(GnuPG::Interface) perl(PerlIO::eol)
+Requires:	perl(GnuPG::Interface)
+Requires:	perl(PerlIO::eol)
 Requires:	perl(RT::Test)
+Requires:	perl(String::ShellQuote)
 Requires:	perl(Test::HTTP::Server::Simple::StashWarnings)
 Requires:	perl(Test::Deep)
-# Required by the testsuite, but test doesn't work outside of source-tree: Requires:  perl(Test::Pod) >= 1.14
 Requires:	perl(Test::Expect)
 Requires:	perl(Test::MockTime)
 Requires:	perl(Test::Warn)
@@ -400,8 +402,13 @@ ln -s /usr/share/fonts/google-droid/DroidSansFallback.ttf ${RPM_BUILD_ROOT}%{_da
 install -d -m755 ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}
 cp -R t ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}
 cp %{SOURCE1} ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}
+
 # pod.t can't be run outside of the source-tree
-rm -rf ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}/pod.t
+rm -rf ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}/t/pod.t
+
+# Some of tests want t/../share/html
+install -d -m755 ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}/share
+ln -s %{RT3_WWWDIR} ${RPM_BUILD_ROOT}%{perl_testdir}/%{name}/share/html
 
 # Fix permissions
 find ${RPM_BUILD_ROOT}%{RT3_WWWDIR} \
@@ -420,7 +427,7 @@ fi
 
 %postun tests
 if [ $1 -eq 0 ]; then
-  %{__rm} -rf %{perl_testdir}/%{cpan_dist_name}
+  %{__rm} -rf %{perl_testdir}/%{name}
 fi
 
 %files
@@ -479,6 +486,9 @@ fi
 %endif
 
 %changelog
+* 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).
 



More information about the perl-devel mailing list