[perl-Log-Dispatch] Upstream update.

[corsepiu]

commit 8239d29d94f6061fc034cfaf8b8525081c685f05
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Fri Jul 12 14:11:15 2013 +0200

    Upstream update.
    
    - Add Conflicts: perl(Log::Dispatch::File::Stamped) >= 0.10.
    - Add %bcond_with release_tests (Default to without, because RELEASE_TESTING
      is currently broken).

 .gitignore             |    2 +-
 perl-Log-Dispatch.spec |   23 +++++++++++++++++++----
 sources                |    2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1712262..475738f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Log-Dispatch-2.38.tar.gz
+/Log-Dispatch-2.40.tar.gz
diff --git a/perl-Log-Dispatch.spec b/perl-Log-Dispatch.spec
index 67f86c8..aa527be 100644
--- a/perl-Log-Dispatch.spec
+++ b/perl-Log-Dispatch.spec
@@ -5,8 +5,12 @@
 #    Default: --without (Exclude tests, which don't work in koji)
 %bcond_with	network
 
+# --with release_tests ... also check "RELEASE_TESTS".
+#     Default: --without (Exclude tests)
+%bcond_with	release_tests
+
 Name:           perl-Log-Dispatch
-Version:        2.38
+Version:        2.40
 Release:        1%{?dist}
 Summary:        Dispatches messages to one or more outputs
 Group:          Development/Libraries
@@ -18,9 +22,10 @@ Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-%{versi
 Patch0:         Log-Dispatch-2.38.diff
 BuildArch:      noarch
 
+BuildRequires:  perl(Apache2::Log)
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(Apache2::Log)
+BuildRequires:  perl(Dist::CheckConflicts) >= 0.02
 BuildRequires:  perl(Fcntl)
 BuildRequires:  perl(Mail::Send)
 BuildRequires:  perl(Mail::Sender)
@@ -36,6 +41,7 @@ BuildRequires:  perl(warnings)
 # testsuite
 BuildRequires:  perl(Test::More) >= 0.88
 
+%if %{with release_tests} 
 # for improved tests
 BuildRequires:  perl(Test::EOL)
 BuildRequires:  perl(Test::NoTabs)
@@ -54,6 +60,10 @@ BuildRequires:  perl(Test::Pod::No404s)
 BuildRequires:  perl(LWP::Protocol::https)
 %endif
 %endif
+%endif
+
+# Ouch - Introduced by upstream in 2.40
+Conflicts:	perl(Log::Dispatch::File::Stamped) >= 0.10
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -81,8 +91,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-RELEASE_TESTING=1 LOG_DISPATCH_TEST_EMAIL="root at localhost.localdomain" \
-make test
+make test %{?with_release_tests:RELEASE_TESTING=1} LOG_DISPATCH_TEST_EMAIL="root at localhost.localdomain"
 
 %files
 %defattr(-,root,root,-)
@@ -91,6 +100,12 @@ make test
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Fri Jul 12 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.40-1
+- Upstream update.
+- Add Conflicts: perl(Log::Dispatch::File::Stamped) >= 0.10.
+- Add %%bcond_with release_tests (Default to without, because RELEASE_TESTING
+  is currently broken).
+
 * Wed Apr 17 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.38-1
 - Upstream update.
 
diff --git a/sources b/sources
index cada6a4..31b60d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-783e907c4f21382774103a0a97a155cf  Log-Dispatch-2.38.tar.gz
+e3ce183bbd27fe984039fe1dcd29ff30  Log-Dispatch-2.40.tar.gz