diff --git a/perl-DateTime-Locale.spec b/perl-DateTime-Locale.spec index a13e61e..ab1c9ce 100644 --- a/perl-DateTime-Locale.spec +++ b/perl-DateTime-Locale.spec @@ -1,6 +1,6 @@ Name: perl-DateTime-Locale Version: 0.45 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Localization support for DateTime.pm # package itself is 'same terms as Perl' # modules under DateTime/Locale/ are generated from data provided by the CLDR project @@ -10,17 +10,28 @@ Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Locale/ Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-%{version}.tar.gz BuildArch: noarch -BuildRequires: perl >= 0:5.006 +BuildRequires: glibc-common +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) +# Run-time: BuildRequires: perl(base) BuildRequires: perl(Carp) -BuildRequires: perl(File::Spec) BuildRequires: perl(List::MoreUtils) -BuildRequires: perl(Module::Build) BuildRequires: perl(Params::Validate) >= 0.91 +BuildRequires: perl(strict) +BuildRequires: perl(utf8) +BuildRequires: perl(warnings) +# Tests: +# File::Find::Rule not used +BuildRequires: perl(File::Spec) BuildRequires: perl(Test::More) +# Optional tests: +BuildRequires: perl(Storable) BuildRequires: perl(Test::Output) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - +# Test::Pod 1.14 not used +# Test::Pod::Coverage 1.04 not used +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(Params::Validate) >= 0.91 # perl-DateTime-Locale used to be bundled with perl-DateTime # ideally, this would be resolved with # Requires: perl-DateTime >= 2:0.70-1 @@ -29,6 +40,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi Conflicts: perl-DateTime <= 1:0.7000-3.fc16 %{?perl_default_filter} +# Remove under-specified dependencies +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Params::Validate\\)$ %description DateTime::Locale is primarily a factory for the various locale sub-classes. @@ -37,23 +50,21 @@ available locales. %prep %setup -q -n DateTime-Locale-%{version} - iconv -f iso-8859-1 -t utf-8 Changes >Changes.iconv \ && touch -r Changes Changes.iconv \ && mv -f Changes.iconv Changes %build -%{__perl} Build.PL installdirs=vendor -./Build +perl Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install -./Build install destdir=%{buildroot} create_packlist=0 -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; - -%{_fixperms} %{buildroot}/* +make pure_install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +%{_fixperms} $RPM_BUILD_ROOT/* %check -./Build test +make test %files %doc Changes LICENSE LICENSE.cldr README @@ -61,6 +72,9 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; %{_mandir}/man3/* %changelog +* Tue Jan 13 2015 Petr Pisar - 0.45-11 +- Modernize spec file + * Fri Aug 29 2014 Jitka Plesnikova - 0.45-10 - Perl 5.20 rebuild