commit f97f3bec9c0d9afc4b77dc8f8da99e03ff9b649b
Author: Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx>
Date: Mon Feb 6 10:16:42 2012 +0100
Upstream update.
- Remove --with mailtests build option (unnecessary).
- Remove Log-Dispatch-2.11-enable-mail-tests.patch (rotten, obsolete).
- Rework spec.
- Enable release tests.
- Make hunspell checks working.
.gitignore | 3 +-
Log-Dispatch-2.11-enable-mail-tests.patch | 18 -------
Log-Dispatch-2.29.diff | 75 +++++++++++++++++++++++++++++
perl-Log-Dispatch.spec | 65 ++++++++++++-------------
sources | 2 +-
5 files changed, 108 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 633dff0..ddd8353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Log-Dispatch-2.22.tar.gz
-/Log-Dispatch-2.27.tar.gz
+/Log-Dispatch-2.29.tar.gz
diff --git a/Log-Dispatch-2.29.diff b/Log-Dispatch-2.29.diff
new file mode 100644
index 0000000..395c0ad
--- /dev/null
+++ b/Log-Dispatch-2.29.diff
@@ -0,0 +1,75 @@
+diff -Naur Log-Dispatch-2.29.orig/lib/Log/Dispatch/File.pm Log-Dispatch-2.29/lib/Log/Dispatch/File.pm
+--- Log-Dispatch-2.29.orig/lib/Log/Dispatch/File.pm 2011-03-18 21:53:17.000000000 +0100
++++ Log-Dispatch-2.29/lib/Log/Dispatch/File.pm 2012-02-06 09:58:23.738876317 +0100
+@@ -220,7 +220,7 @@
+ Whether or not the file should be closed after each write. This
+ defaults to false.
+
+-If this is true, then the mode will aways be append, so that the file
++If this is true, then the mode will always be append, so that the file
+ is not re-written for each new message.
+
+ =item * autoflush ($)
+diff -Naur Log-Dispatch-2.29.orig/lib/Log/Dispatch/Syslog.pm Log-Dispatch-2.29/lib/Log/Dispatch/Syslog.pm
+--- Log-Dispatch-2.29.orig/lib/Log/Dispatch/Syslog.pm 2011-03-18 21:53:17.000000000 +0100
++++ Log-Dispatch-2.29/lib/Log/Dispatch/Syslog.pm 2012-02-06 10:04:50.158016803 +0100
+@@ -157,7 +157,7 @@
+
+ Specifies what type of program is doing the logging to the system log.
+ Valid options are 'auth', 'authpriv', 'cron', 'daemon', 'kern',
+-'local0' through 'local7', 'mail, 'news', 'syslog', 'user',
++'local0' through 'local7', 'mail', 'news', 'syslog', 'user',
+ 'uucp'. Defaults to 'user'
+
+ =item * socket ($ or \@)
+diff -Naur Log-Dispatch-2.29.orig/t/release-pod-spell.t Log-Dispatch-2.29/t/release-pod-spell.t
+--- Log-Dispatch-2.29.orig/t/release-pod-spell.t 2011-03-18 21:53:17.000000000 +0100
++++ Log-Dispatch-2.29/t/release-pod-spell.t 2012-02-06 10:11:17.832390477 +0100
+@@ -27,9 +27,13 @@
+ all_pod_files_spelling_ok;
+
+ __DATA__
++''
++API
+ Cholet
++CPAN
+ Dumont
+ Goess
++Log4perl
+ Manfredi
+ Miyagawa
+ Pfeiffer
+@@ -43,18 +47,33 @@
+ UTF
+ apache
+ appenders
++'append'
+ auth
+ authpriv
+ autoflushed
+ classname
+ crit
++'daemon'
+ emerg
++'err'
+ filename
+ filename
+ ident
+ kern
++'local0'
++'local7'
++log4j
+ logopt
++'mail'
++'message'
++'news'
+ params
+ smtp
+ stderr
++subclass's
++subclasses
++'user'
+ uucp
++'warn'
++'warning'
++'write'
diff --git a/perl-Log-Dispatch.spec b/perl-Log-Dispatch.spec
index e187533..786412f 100644
--- a/perl-Log-Dispatch.spec
+++ b/perl-Log-Dispatch.spec
@@ -1,34 +1,31 @@
-# Build switch:
-# --with mailtests Enable mail tests
-
-%define mailtests 0
-
-%{?_with_mailtests:%define mailtests 1}
-
Name: perl-Log-Dispatch
-Version: 2.27
-Release: 4%{?dist}
+Version: 2.29
+Release: 1%{?dist}
Summary: Dispatches messages to one or more outputs
Group: Development/Libraries
License: Artistic 2.0
URL: http://search.cpan.org/dist/Log-Dispatch/
Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-%{version}.tar.gz
-Patch0: Log-Dispatch-2.11-enable-mail-tests.patch
+
+# Hacks to make spell checking tests work with hunspell
+Patch0: Log-Dispatch-2.29.diff
BuildArch: noarch
-BuildRequires: perl(Module::Build)
-BuildRequires: perl(Params::Validate)
-%if %{mailtests}
+BuildRequires: perl(Apache2::Log)
BuildRequires: perl(Mail::Send), perl(Mail::Sender)
BuildRequires: perl(Mail::Sendmail), perl(MIME::Lite)
-%endif
-BuildRequires: perl(File::Find::Rule)
-BuildRequires: perl(Apache2::Log)
-BuildRequires: perl(Sys::Syslog) >= 0.16
+BuildRequires: perl(Params::Validate) >= 0.15
+BuildRequires: perl(Sys::Syslog) >= 0.25
+
+# testsuite
+BuildRequires: perl(Test::More) >= 0.88
# for improved tests
-BuildRequires: perl(Test::Kwalitee)
+BuildRequires: perl(Test::EOL)
+BuildRequires: perl(Test::NoTabs)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
+BuildRequires: perl(Test::Spelling)
+BuildRequires: hunspell-en
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
@@ -39,32 +36,24 @@ new dispatcher object and particularly for creating new outputs.
%prep
%setup -q -n Log-Dispatch-%{version}
-%if %{mailtests}
%patch0 -p1
-%endif
-
-# Requirements list: exclude mod_perl
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v 'perl(Apache'
-__EOF__
-%define __perl_requires %{_builddir}/Log-Dispatch-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
+sed -i -e "s,set_spell_cmd(.*),set_spell_cmd(\'hunspell -l\')," t/release-pod-spell.t
%build
%{__perl} Makefile.PL installdirs=vendor
make
%install
-make install DESTDIR=$RPM_BUILD_ROOT create_packlist=0
-chmod -R u+w $RPM_BUILD_ROOT/*
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-# Delete unnecessary files.
-rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/auto/
-rm -rf $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{_fixperms} $RPM_BUILD_ROOT/*
%check
-IS_MAINTAINER=1 make test
+RELEASE_TESTING=1 LOG_DISPATCH_TEST_EMAIL="root@localhost.localdomain" \
+make test
%files
%defattr(-,root,root,-)
@@ -73,6 +62,14 @@ IS_MAINTAINER=1 make test
%{_mandir}/man3/*.3pm*
%changelog
+* Mon Feb 06 2012 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 2.29-1
+- Upstream update.
+- Remove --with mailtests build option (unnecessary).
+- Remove Log-Dispatch-2.11-enable-mail-tests.patch (rotten, obsolete).
+- Rework spec.
+- Enable release tests.
+- Make hunspell checks working.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.27-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 1ccc389..9e56a80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bd3420ef0df39f2e32fbbe6b57a1db8 Log-Dispatch-2.27.tar.gz
+781a4b5a9db2b617d2487dadecf65081 Log-Dispatch-2.29.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
