diff --git a/.cvsignore b/.cvsignore index 581c1c1..5bd0854 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Config-Any-0.18.tar.gz +Config-Any-0.19.tar.gz diff --git a/auto.ini b/auto.ini new file mode 100644 index 0000000..69b39a7 --- /dev/null +++ b/auto.ini @@ -0,0 +1,24 @@ +[add_build_requires] +; for the different formats... +perl(Config::General)=0 +perl(Config::Tiny)=0 +perl(JSON::XS)=0 +perl(Module::Build)=0 +perl(Scalar::Util)=0 +perl(XML::LibXML)=0 +perl(XML::Simple)=0 +perl(YAML::XS)=0 +perl(version)=0 +; tests +perl(Scalar::Util)=0 +perl(XML::LibXML)=0 +; optional tests +perl(Test::Pod)=0 + +[add_requires] +perl(Config::General)=0 +perl(Config::Tiny)=0 +perl(JSON::XS)=0 +perl(XML::Simple)=0 +perl(YAML::XS)=0 + diff --git a/perl-Config-Any.spec b/perl-Config-Any.spec index 0fdb28e..4da20e8 100644 --- a/perl-Config-Any.spec +++ b/perl-Config-Any.spec @@ -1,40 +1,40 @@ Name: perl-Config-Any -Version: 0.18 -Release: 1%{?dist} Summary: Load configuration from different file formats, transparently +Version: 0.19 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries +Source0: http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/Config-Any-%{version}.tar.gz URL: http://search.cpan.org/dist/Config-Any/ -Source0: http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/Config-Any-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildArch: noarch +BuildRequires: perl(Config::General) +BuildRequires: perl(Config::Tiny) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 +BuildRequires: perl(JSON::XS) BuildRequires: perl(Module::Build) BuildRequires: perl(Module::Pluggable) >= 3.01 +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) BuildRequires: perl(version) -BuildRequires: perl(JSON::Syck) -BuildRequires: perl(Config::General) -BuildRequires: perl(Config::Tiny) +BuildRequires: perl(XML::LibXML) BuildRequires: perl(XML::Simple) BuildRequires: perl(YAML::XS) -# tests -BuildRequires: perl(Test::More) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(XML::LibXML) - -# optional tests -BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) - -# not picked up -Requires: perl(JSON::Syck) Requires: perl(Config::General) Requires: perl(Config::Tiny) +Requires: perl(JSON::XS) +Requires: perl(Module::Pluggable) >= 3.01 Requires: perl(XML::Simple) Requires: perl(YAML::XS) +%{?perl_default_filter} +%{?perl_default_subpackage_tests} + %description Config::Any provides a facility for Perl applications and libraries to load configuration data from multiple different file formats. It supports @@ -44,39 +44,14 @@ Perl code. %prep %setup -q -n Config-Any-%{version} -# make rpmlint happy :) -find t/ -type f -exec sed -i 's/\r//' {} \; -perl -pi -e 's|^#!perl|#!/usr/bin/perl|' t/*.t - -# Filter unwanted Provides: -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/perl(MockApp)/d' -EOF - -%define __perl_provides %{_builddir}/Config-Any-%{version}/%{name}-prov -chmod +x %{__perl_provides} - -# Filter unwanted Requires: -cat << \EOF > %{name}-req -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/perl(Test::More)/d; /perl(Scalar::Util)/d' -EOF - -%define __perl_requires %{_builddir}/Config-Any-%{version}/%{name}-req -chmod +x %{__perl_requires} - %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf %{buildroot} -make pure_install PERL_INSTALL_ROOT=%{buildroot} +make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' @@ -91,11 +66,21 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) # conf/ for examples of different config types -%doc Changes README t/ +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Mar 01 2010 Chris Weyl 0.19-1 +- update by Fedora::App::MaintainerTools 0.004 +- PERL_INSTALL_ROOT => DESTDIR +- added a new br on perl(ExtUtils::MakeMaker) (version 6.42) +- dropped old BR on perl(JSON::Syck) +- added manual BR on perl(JSON::XS) +- added a new req on perl(Module::Pluggable) (version 3.01) +- dropped old requires on perl(JSON::Syck) +- added manual requires on perl(JSON::XS) + * Mon Jan 11 2010 Iain Arnell 0.18-1 - update to latest upstream version - prefer YAML::XS over YAML::Syck diff --git a/sources b/sources index 8adfc61..9ae220e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bbcd8879fd78dca61fb882f7a665b055 Config-Any-0.18.tar.gz +84e2da067d07da59a6482697d2c25b2c Config-Any-0.19.tar.gz