- license fixes

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

diff --git a/perl-AnyData.spec b/perl-AnyData.spec
index 3f0ef00ab6db34823029ed99ede423d7bb43e2e0..e6722c958f995f2d749bbb66816a7902a7dbac54 100644 (file)
--- a/perl-AnyData.spec
+++ b/perl-AnyData.spec
@@ -1,21 +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:       2
-License:       GPL/Artistic
+Version:       0.08
+Release:       1
+# same as perl
+License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/authors/id/J/JZ/JZUCKER/AnyData-%{version}.tar.gz
-BuildRequires: perl >= 5.6
-BuildRequires: rpm-perlprov >= 3.0.3-26
-%if %{?_with_test:1}%{!?_with_test: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)
 
@@ -23,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).
@@ -42,20 +46,27 @@ parsowalnymi nag
 %setup -q -n %{pdir}-%{version}
 
 %build
-%{__perl} Makefile.PL
+%{__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
 
 %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/*