- updated to 0.08, enabled tests by default (seem fixed)

Changed files:
    perl-AnyData.spec -> 1.14

diff --git a/perl-AnyData.spec b/perl-AnyData.spec
index 93f1fdfea73dab5d2c67071cf1f2c7e85b125599..6eff973e5ec39e3929536f2dbe8fea3e09d34de1 100644 (file)
--- a/perl-AnyData.spec
+++ b/perl-AnyData.spec
@@ -1,22 +1,25 @@
 #
 # Conditional build:
-# _with_tests - perform "make test" (hangs with XML::Twig or HTML::TableExtract installed)
+%bcond_without tests   # don't perform "make test"
+#
 %include       /usr/lib/rpm/macros.perl
 %define        pdir    AnyData
-Summary:       AnyData -- easy access to data in many formats
-Summary(pl):   AnyData -- ³atwy dostêp do danych w ró¿nych formatach
+Summary:       AnyData - easy access to data in many formats
+Summary(pl):   AnyData - ³atwy dostêp do danych w ró¿nych formatach
 Name:          perl-%{pdir}
-Version:       0.05
-Release:       3
-License:       GPL/Artistic
+Version:       0.08
+Release:       1
+# same as perl
+License:       GPL or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/authors/id/J/JZ/JZUCKER/AnyData-%{version}.tar.gz
-# Source0-md5: e3a70cbbb39bd14e3dd61f894e8850fe
-BuildRequires: perl-devel >= 5.6
-BuildRequires: rpm-perlprov >= 4.1-13
-%if %{?_with_tests:1}%{!?_with_tests:0}
+# Source0-md5: 79686834bf70e3201c99e8ba965b883f
+%if %{with tests}
+BuildRequires: perl-CGI
 BuildRequires: perl(Data::Dumper)
 %endif
+BuildRequires: perl-devel >= 5.8.0
+BuildRequires: rpm-perlprov >= 4.1-13
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -24,8 +27,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The AnyData modules provide simple and uniform access to data from
-many sources -- perl arrays, local files, remote files retrievable via
-http or ftp -- and in many formats including flat files (CSV, Fixed
+many sources - perl arrays, local files, remote files retrievable via
+http or ftp - and in many formats including flat files (CSV, Fixed
 Length, Tab Delimited, etc), standard format files (Web Logs, Passwd
 files, etc.),  structured files (XML, HTML Tables) and binary files
 with parseable headers (mp3s, jpgs, pngs, etc).
@@ -46,12 +49,14 @@ parsowalnymi nag
 %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
 %{__make}
-%{?_with_tests:%{__make} test}
+
+%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,5 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %{perl_vendorlib}/*.pm
-%{perl_vendorlib}/%{pdir}
+%dir %{perl_vendorlib}/AnyData
+%dir %{perl_vendorlib}/AnyData/Format
+%{perl_vendorlib}/AnyData/Format/*.pm
+%dir %{perl_vendorlib}/AnyData/Storage
+%{perl_vendorlib}/AnyData/Storage/*.pm
 %{_mandir}/man3/*