diff --git a/perl-HTML-Tagset.spec b/perl-HTML-Tagset.spec
index d33762f..677a5a2 100644
--- a/perl-HTML-Tagset.spec
+++ b/perl-HTML-Tagset.spec
@@ -1,19 +1,30 @@
+%{bcond_without perl_HTML_Tagset_enables_optional_test}
+
Name: perl-HTML-Tagset
Version: 3.20
-Release: 31%{?dist}
+Release: 32%{?dist}
Summary: HTML::Tagset - data tables useful in parsing HTML
-Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/HTML-Tagset/
Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-%{version}.tar.gz
BuildArch: noarch
+BuildRequires: make
BuildRequires: perl-generators
-BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-interpreter
+BuildRequires: perl(:VERSION) >= 5.4
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires: perl(strict)
+# Run-time
+BuildRequires: perl(vars)
+# Tests
BuildRequires: perl(Test)
BuildRequires: perl(Test::More)
+# Optional tests
# Test::Pod -> Pod::Simple -> HTML::Entities (HTML::Parser) -> HTML::Tagset
%if 0%{!?perl_bootstrap:1}
-BuildRequires: perl(Test::Pod)
+%if %{with perl_HTML_Tagset_enables_optional_test}
+BuildRequires: perl(Test::Pod) >= 1.14
+%endif
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -25,13 +36,11 @@ HTML parsing operations, such as tag and entity names.
%setup -q -n HTML-Tagset-%{version}
%build
-perl Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
make %{?_smp_mflags}
%install
make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
%{_fixperms} %{buildroot}
%check
@@ -43,6 +52,9 @@ make test
%{_mandir}/man3/HTML::Tagset.3pm*
%changelog
+* Thu Nov 02 2017 Jitka Plesnikova - 3.20-32
+- Specify all dependencies; Modernize spec
+
* Thu Jul 27 2017 Fedora Release Engineering - 3.20-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild