- license fixes

[packages/perl-AnyData.git] / perl-AnyData.spec

diff --git a/perl-AnyData.spec b/perl-AnyData.spec
index 169e581b0f383dcda93beddfabca274235b6ea2c..e6722c958f995f2d749bbb66816a7902a7dbac54 100644 (file)
--- a/perl-AnyData.spec
+++ b/perl-AnyData.spec
@@ -1,28 +1,34 @@
 #
 # Conditional build:
-# _without_tests - do not perform "make test"
+%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
+Version:       0.08
 Release:       1
-License:       GPL/Artistic
+# same as perl
+License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
-Source0:       ftp://ftp.cpan.org/pub/CPAN/authors/id/J/JZ/JZUCKER/AnyData-%{version}.tar.gz
-BuildRequires: perl >= 5.6
-BuildRequires: rpm-perlprov >= 3.0.3-26
-%if %{?_without_test:0}%{!?_without_test:1}
+Source0:       http://www.cpan.org/authors/id/J/JZ/JZUCKER/AnyData-%{version}.tar.gz
+# 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)
 
+%define                _noautoreq      'perl(XML::Twig)' 'perl(HTML::TableExtract)'
+
 %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).
@@ -40,20 +46,27 @@ parsowalnymi nag
 %setup -q -n %{pdir}-%{version}
 
 %build
-perl Makefile.PL
+%{__perl} Makefile.PL \
+       INSTALLDIRS=vendor
 %{__make}
-%{!?_without_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
 
 %files
 %defattr(644,root,root,755)
-%{perl_sitelib}/*.pm
-%{perl_sitelib}/%{pdir}
+%{perl_vendorlib}/*.pm
+%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/*