From f12da6d93aacc87bda84cfc1ae0d2f3c321f11c7 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sun, 26 Aug 2007 15:53:36 +0000 Subject: [PATCH] license tag fix --- perl-HTML-Tree.spec | 61 ++++++++++++++++++++++++++++++++------------- sources | 2 +- 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/perl-HTML-Tree.spec b/perl-HTML-Tree.spec index 53cd84b..cb72e2d 100644 --- a/perl-HTML-Tree.spec +++ b/perl-HTML-Tree.spec @@ -1,19 +1,19 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-HTML-Tree -Version: 3.18 -Release: 2 -Epoch: 0 +Version: 3.23 +Release: 2%{?dist} Summary: HTML tree handling modules for Perl - Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic URL: http://search.cpan.org/dist/HTML-Tree/ -Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Tree-3.18.tar.gz +Source0: http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 perl(HTML::Parser) +BuildRequires: perl(HTML::Parser) >= 2.19 +BuildRequires: perl(HTML::Tagset) >= 3.02 +# For improved tests +BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::More) +Epoch: 1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -23,17 +23,22 @@ also relevent documentation. These modules used to be part of the libwww-perl distribution, but are now unbundled in order to facilitate a separate development track. - %prep %setup -q -n HTML-Tree-%{version} %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree +cat << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ + sed -e '/^perl(main)$/d' +EOF +%define __perl_provides %{_builddir}/HTML-Tree-%{version}/%{name}-prov +chmod +x %{__perl_provides} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT @@ -41,23 +46,45 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* - -%check || : +%check make test - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README TODO htmltree %{perl_vendorlib}/HTML %{_mandir}/man3/HTML::*3* - %changelog +* Sun Aug 26 2007 Tom "spot" Callaway 3.23-2 +- license tag fix + +* Wed Jan 17 2007 Tom "spot" Callaway 3.23-1 +- bump to 3.23 + +* Fri Sep 15 2006 Tom "spot" Callaway 3.21-1 +- bump to 3.21 + +* Tue Jul 11 2006 Tom "spot" Callaway 3.20-2 +- bump epoch to ensure clean upgrades + +* Fri Jul 7 2006 Tom "spot" Callaway 3.20-1 +- bump to 3.20 + +* Mon Jan 16 2006 Ralf Corsépius - 3.1901-2 +- BR: perl(Test::Pod). + +* Mon Jan 16 2006 Ralf Corsépius - 3.1901-1 +- Spec cleanup. +- Filter Provides: perl(main). +- Upstream update. + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Tue Jan 4 2005 Ville Skyttä - 0:3.18-2 - Don't install htmltree into %%{_bindir} but include it in docs. diff --git a/sources b/sources index e340114..ad31c1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a9e4e565648c9772e7d8ec6d4392497 HTML-Tree-3.18.tar.gz +6352f50be402301f79b580dd235d7762 HTML-Tree-3.23.tar.gz