commit f1dc5d9c0836e08d3173b5c3ca70f5ec87015868
Author: Marcela MaÅlÃÅovà <mmaslano@xxxxxxxxxx>
Date: Mon Oct 18 14:28:38 2010 +0200
Update to 4.0
- remove old patch, included in new version
- add provides, requires according to new version
- use Build.PL instead of Makefile.PL
.gitignore | 1 +
missing_close_tag.patch | 12 ---------
perl-HTML-Tree.spec | 62 ++++++++++++++++++++++------------------------
sources | 2 +-
4 files changed, 32 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ef1765..59580e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
HTML-Tree-3.23.tar.gz
+/HTML-Tree-4.0.tar.gz
diff --git a/perl-HTML-Tree.spec b/perl-HTML-Tree.spec
index b84274e..fae3461 100644
--- a/perl-HTML-Tree.spec
+++ b/perl-HTML-Tree.spec
@@ -1,68 +1,66 @@
+%define version_real 4.0
+
Name: perl-HTML-Tree
-Version: 3.23
-Release: 11%{?dist}
+Version: 4.00
+Release: 1%{?dist}
+Epoch: 1
Summary: HTML tree handling modules for Perl
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/HTML-Tree/
-Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-%{version}.tar.gz
-# Upstream bug filed:
-# https://rt.cpan.org/Ticket/Display.html?id=49932
-Patch0: missing_close_tag.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://www.cpan.org/authors/id/J/JF/JFEARN/HTML-Tree-%{version_real}.tar.gz
BuildArch: noarch
-BuildRequires: perl(HTML::Parser) >= 2.19
+BuildRequires: perl(HTML::Parser) >= 3.46
BuildRequires: perl(HTML::Tagset) >= 3.02
+BuildRequires: perl(Module::Build)
# For improved tests
-BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::Exception)
+BuildRequires: perl(Test::Pod) >= 1.00
BuildRequires: perl(Test::More)
-Epoch: 1
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+Requires: perl(HTML::Parser) >= 3.46
+Requires: perl(HTML::Tagset) >= 3.02
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# add because of possible problems with not mathing cpan,rpm version
+Provides: perl(HTML::Tree) = %{version}
%description
This distribution contains a suite of modules for representing,
creating, and extracting information from HTML syntax trees; there is
-also relevent documentation. These modules used to be part of the
+also relevant 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}
-%patch0 -p1 -b .missing-close-tag
-%{__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}
+%setup -q -n HTML-Tree-%{version_real}
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+%{__perl} Build.PL installdirs=vendor
+./Build
%install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-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/*
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
%check
-make test
+./Build test
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc Changes README TODO htmltree
+%doc Changes README TODO
+%{_bindir}/htmltree
%{perl_vendorlib}/HTML
%{_mandir}/man3/HTML::*3*
%changelog
+* Mon Oct 18 2010 Marcela MaÅlÃÅovà <mmaslano@xxxxxxxxxx> - 1:3.40-1
+- update, adjust specfile to use Build.PL
+
* Sun May 02 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 1:3.23-11
- Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index ad31c1b..40b8a2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6352f50be402301f79b580dd235d7762 HTML-Tree-3.23.tar.gz
+7ba44995905a117c00f6744350799883 HTML-Tree-4.0.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
