commit 8cb5ba6fea63b4abadc299b144254a1720abd1e3
Author: Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx>
Date: Thu Oct 23 18:10:15 2014 +0200
Upstream update.
- Fix bogus %changelog entry.
- Reflect upstream having changed to Build.PL.
- Work-around to upstream having missed to install bin/scrapper.
.gitignore | 2 +-
perl-Web-Scraper.spec | 37 ++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3c8631..bff0269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Web-Scraper-0.37.tar.gz
+/Web-Scraper-0.38.tar.gz
diff --git a/perl-Web-Scraper.spec b/perl-Web-Scraper.spec
index b9f3a02..ad0dc49 100644
--- a/perl-Web-Scraper.spec
+++ b/perl-Web-Scraper.spec
@@ -6,20 +6,18 @@
%bcond_with live_test
Name: perl-Web-Scraper
-Version: 0.37
-Release: 6%{?dist}
+Version: 0.38
+Release: 1%{?dist}
Summary: Web Scraping Toolkit using HTML and CSS Selectors or XPath expressions
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Web-Scraper/
Source0: http://www.cpan.org/authors/id/M/MI/MIYAGAWA/Web-Scraper-%{version}.tar.gz
-# Misc. hacks to make the testsuite working
-Patch0: Web-Scraper-0.36-testsuite-hacks.patch
BuildArch: noarch
BuildRequires: perl(base)
+BuildRequires: perl(Module::Build::Tiny) >= 0.039
BuildRequires: perl(Carp)
-BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(HTML::Entities)
BuildRequires: perl(HTML::Selector::XPath) >= 0.03
BuildRequires: perl(HTML::Tagset)
@@ -57,33 +55,42 @@ returning a neatly arranged Perl data structure.
%prep
%setup -q -n Web-Scraper-%{version}
-%patch0 -p1
+
+# Package does not depend on ExtUtils::MakeMaker
+sed -i '/ExtUtils::MakeMaker/d' META.*
%build
-# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing
-# missing modules
-%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
-make %{?_smp_mflags}
+%{__perl} Build.PL --installdirs=vendor
+./Build
%install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+./Build install --destdir=$RPM_BUILD_ROOT --create_packlist=0
+
+# Web-Scraper >= 0.38 misses to install bin/scaper
+# Install it manually
+install -m 755 -d ${RPM_BUILD_ROOT}%{_bindir}
+install -m 755 bin/scraper ${RPM_BUILD_ROOT}%{_bindir}
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} $RPM_BUILD_ROOT/*
%check
-make test LEAK_TEST=1 %{?with_live_test:LIVE_TEST=1}
+LEAK_TEST=1 %{?with_live_test:LIVE_TEST=1} ./Build test
%files
-%defattr(-,root,root,-)
%doc Changes README
%{_bindir}/scraper
%{perl_vendorlib}/*
%{_mandir}/man3/*
%changelog
+* Thu Oct 23 2014 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 0.38-1
+- Upstream update.
+- Fix bogus %%changelog entry.
+- Reflect upstream having changed to Build.PL.
+- Work-around to upstream having missed to install bin/scrapper.
+
* Fri Aug 29 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.37-6
- Perl 5.20 rebuild
@@ -110,7 +117,7 @@ make test LEAK_TEST=1 %{?with_live_test:LIVE_TEST=1}
* Tue Jul 10 2012 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> 0.36-1.20120710.0
- Merge in Xavier's spec.
-* Fri Jan 21 2012 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> 0.36-1.20120121.0
+* Sat Jan 21 2012 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> 0.36-1.20120121.0
- More deps.
- Add %%{?perl_default_filter}.
diff --git a/sources b/sources
index ec92430..1c25d67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a90843a0f84935c4fbd750aa5d08d94 Web-Scraper-0.37.tar.gz
+86948e993114263d6cf133654ead36d8 Web-Scraper-0.38.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
