diff --git a/gendep.macros b/gendep.macros
index 13cbf58..a521a6b 100644
--- a/gendep.macros
+++ b/gendep.macros
@@ -1,248 +1,4 @@
 %global gendep_perl \
-Requires: perl(:VERSION) >= 5.0.0 \
-Requires: perl(:VERSION) >= 5.10.1 \
-Requires: perl(:VERSION) >= 5.24.0 \
-Requires: perl(:VERSION) >= 5.3.0 \
-Requires: perl(:VERSION) >= 5.5.0 \
-Requires: perl(:VERSION) >= 5.6.0 \
-Requires: perl(:VERSION) >= 5.7.0 \
-Requires: perl(:VERSION) >= 5.7.3 \
-Requires: perl(:VERSION) >= 5.8.0 \
-Requires: perl(:VERSION) >= 5.9.1 \
-Requires: perl(:VERSION) >= 5.9.4 \
-Requires: perl(B) \
-Requires: perl(B::Concise) \
-Requires: perl(B::Op_private) \
-Requires: perl(B::Terse) \
-Requires: perl(Carp) \
-Requires: perl(Class::Struct) \
-Requires: perl(Config) \
-Requires: perl(Cwd) \
-Requires: perl(Exporter) \
-Requires: perl(ExtUtils::Constant::Base) \
-Requires: perl(ExtUtils::Constant::Utils) \
-Requires: perl(ExtUtils::Constant::XS) \
-Requires: perl(Fcntl) \
-Requires: perl(File::Basename) \
-Requires: perl(File::Path) \
-Requires: perl(File::Spec) \
-Requires: perl(File::Spec::Functions) \
-Requires: perl(I18N::LangTags) \
-Requires: perl(IO::File) \
-Requires: perl(IPC::Open3) \
-Requires: perl(Opcode) >= 1.01 \
-Requires: perl(POSIX) \
-Requires: perl(Scalar::Util) >= 1.10 \
-Requires: perl(Symbol) \
-Requires: perl(Text::Tabs) \
-Requires: perl(Text::Wrap) \
-Requires: perl(Tie::Handle) \
-Requires: perl(Tie::Hash) \
-Requires: perl(Tie::StdHandle) \
-Requires: perl(Time::tm) \
-Requires: perl(Unicode::Normalize) \
-Requires: perl(XSLoader) \
-Requires: perl(_charnames) \
-Requires: perl(bytes) \
-Requires: perl(charnames) \
-Requires: perl(constant) \
-Requires: perl(feature) \
-Requires: perl(if) \
-Requires: perl(integer) \
-Requires: perl(overload) \
-Requires: perl(parent) \
-Requires: perl(re) \
-Requires: perl(strict) \
-Requires: perl(subs) \
-Requires: perl(threads) \
-Requires: perl(threads::shared) \
-Requires: perl(unicore::Name) \
-Requires: perl(utf8) \
-Requires: perl(vars) \
-Requires: perl(warnings) \
-Requires: perl(warnings::register) \
-Provides: perl(AnyDBM_File) = 1.01 \
-Provides: perl(AutoLoader) = 5.74 \
-Provides: perl(AutoSplit) = 1.06 \
-Provides: perl(B) = 1.68 \
-Provides: perl(B::Concise) = 0.999 \
-Provides: perl(B::Deparse) = 1.40 \
-Provides: perl(B::OBJECT) \
-Provides: perl(B::Op_private) = 5.026000 \
-Provides: perl(B::Showlex) = 1.05 \
-Provides: perl(B::Terse) = 1.07 \
-Provides: perl(B::Xref) = 1.06 \
-Provides: perl(Benchmark) = 1.22 \
-Provides: perl(Class::Struct) = 0.65 \
-Provides: perl(Class::Struct::Tie_ISA) \
-Provides: perl(Config) = 5.026000 \
-Provides: perl(Config::Extensions) = 0.01 \
-Provides: perl(DB) = 1.08 \
-Provides: perl(DBM_Filter) = 0.06 \
-Provides: perl(DBM_Filter::compress) = 0.03 \
-Provides: perl(DBM_Filter::encode) = 0.03 \
-Provides: perl(DBM_Filter::int32) = 0.03 \
-Provides: perl(DBM_Filter::null) = 0.03 \
-Provides: perl(DBM_Filter::utf8) = 0.03 \
-Provides: perl(DirHandle) = 1.04 \
-Provides: perl(Dumpvalue) = 1.18 \
-Provides: perl(DynaLoader) = 1.42 \
-Provides: perl(EVERY::LAST) \
-Provides: perl(English) = 1.10 \
-Provides: perl(ExtUtils::Constant) = 0.23 \
-Provides: perl(ExtUtils::Constant::Base) = 0.05 \
-Provides: perl(ExtUtils::Constant::ProxySubs) = 0.08 \
-Provides: perl(ExtUtils::Constant::Utils) = 0.03 \
-Provides: perl(ExtUtils::Constant::XS) = 0.03 \
-Provides: perl(Fcntl) = 1.13 \
-Provides: perl(File::Basename) = 2.85 \
-Provides: perl(File::Compare) = 1.1006 \
-Provides: perl(File::Copy) = 2.32 \
-Provides: perl(File::DosGlob) = 1.12 \
-Provides: perl(File::Find) = 1.34 \
-Provides: perl(File::Glob) = 1.28 \
-Provides: perl(File::stat) = 1.07 \
-Provides: perl(FileCache) = 1.09 \
-Provides: perl(FileHandle) = 2.03 \
-Provides: perl(FindBin) = 1.51 \
-Provides: perl(GDBM_File) = 1.15 \
-Provides: perl(Getopt::Std) = 1.12 \
-Provides: perl(Hash::Util) = 0.22 \
-Provides: perl(Hash::Util::FieldHash) = 1.19 \
-Provides: perl(I18N::Collate) = 1.02 \
-Provides: perl(I18N::LangTags) = 0.42 \
-Provides: perl(I18N::LangTags::Detect) = 1.06 \
-Provides: perl(I18N::LangTags::List) = 0.39 \
-Provides: perl(I18N::Langinfo) = 0.13 \
-Provides: perl(IPC::Open2) = 1.04 \
-Provides: perl(IPC::Open3) = 1.20 \
-Provides: perl(NDBM_File) = 1.14 \
-Provides: perl(NEXT) = 0.67 \
-Provides: perl(NEXT::ACTUAL) \
-Provides: perl(NEXT::ACTUAL::DISTINCT) \
-Provides: perl(NEXT::ACTUAL::UNSEEN) \
-Provides: perl(NEXT::DISTINCT) \
-Provides: perl(NEXT::DISTINCT::ACTUAL) \
-Provides: perl(NEXT::UNSEEN) \
-Provides: perl(NEXT::UNSEEN::ACTUAL) \
-Provides: perl(Net::hostent) = 1.01 \
-Provides: perl(Net::netent) = 1.00 \
-Provides: perl(Net::protoent) = 1.00 \
-Provides: perl(Net::servent) = 1.01 \
-Provides: perl(O) = 1.01 \
-Provides: perl(ODBM_File) = 1.14 \
-Provides: perl(Opcode) = 1.39 \
-Provides: perl(POSIX) = 1.76 \
-Provides: perl(POSIX::SigAction) \
-Provides: perl(POSIX::SigRt) \
-Provides: perl(POSIX::SigSet) \
-Provides: perl(PerlIO) = 1.10 \
-Provides: perl(PerlIO::encoding) = 0.25 \
-Provides: perl(PerlIO::mmap) = 0.016 \
-Provides: perl(PerlIO::scalar) = 0.26 \
-Provides: perl(PerlIO::via) = 0.16 \
-Provides: perl(Pod::Functions) = 1.11 \
-Provides: perl(SDBM_File) = 1.14 \
-Provides: perl(Safe) = 2.40 \
-Provides: perl(Search::Dict) = 1.07 \
-Provides: perl(SelectSaver) = 1.02 \
-Provides: perl(Symbol) = 1.08 \
-Provides: perl(Sys::Hostname) = 1.20 \
-Provides: perl(Term::Complete) = 1.403 \
-Provides: perl(Term::ReadLine) = 1.16 \
-Provides: perl(Term::ReadLine::Stub) \
-Provides: perl(Term::ReadLine::TermCap) \
-Provides: perl(Term::ReadLine::Tk) \
-Provides: perl(Text::Abbrev) = 1.02 \
-Provides: perl(Thread) = 3.04 \
-Provides: perl(Thread::Semaphore) = 2.13 \
-Provides: perl(Tie::Array) = 1.06 \
-Provides: perl(Tie::ExtraHash) \
-Provides: perl(Tie::File) = 1.02 \
-Provides: perl(Tie::File::Cache) \
-Provides: perl(Tie::File::Heap) \
-Provides: perl(Tie::Handle) = 4.2 \
-Provides: perl(Tie::Hash) \
-Provides: perl(Tie::Hash) = 1.05 \
-Provides: perl(Tie::Hash::NamedCapture) = 0.10 \
-Provides: perl(Tie::Memoize) = 1.1 \
-Provides: perl(Tie::RefHash) = 1.39 \
-Provides: perl(Tie::RefHash::Nestable) \
-Provides: perl(Tie::Scalar) = 1.04 \
-Provides: perl(Tie::StdArray) \
-Provides: perl(Tie::StdHandle) = 4.4 \
-Provides: perl(Tie::StdHash) \
-Provides: perl(Tie::StdScalar) \
-Provides: perl(Tie::SubstrHash) = 1.00 \
-Provides: perl(Time::gmtime) = 1.03 \
-Provides: perl(Time::localtime) = 1.02 \
-Provides: perl(Time::tm) = 1.00 \
-Provides: perl(UNIVERSAL) = 1.13 \
-Provides: perl(Unicode::UCD) = 0.68 \
-Provides: perl(User::grent) = 1.01 \
-Provides: perl(User::pwent) = 1.00 \
-Provides: perl(_charnames) = 1.44 \
-Provides: perl(arybase) = 0.12 \
-Provides: perl(attributes) = 0.29 \
-Provides: perl(autouse) = 1.11 \
-Provides: perl(base) = 2.25 \
-Provides: perl(blib) = 1.06 \
-Provides: perl(bytes) = 1.05 \
-Provides: perl(bytes_heavy.pl) \
-Provides: perl(charnames) = 1.44 \
-Provides: perl(deprecate) = 0.03 \
-Provides: perl(diagnostics) = 1.36 \
-Provides: perl(dumpvar.pl) \
-Provides: perl(encoding::warnings) = 0.13 \
-Provides: perl(feature) = 1.47 \
-Provides: perl(fields) = 2.23 \
-Provides: perl(filetest) = 1.03 \
-Provides: perl(if) = 0.0606 \
-Provides: perl(less) = 0.03 \
-Provides: perl(lib) = 0.64 \
-Provides: perl(locale) = 1.09 \
-Provides: perl(mro) = 1.20 \
-Provides: perl(ops) = 1.02 \
-Provides: perl(overload) = 1.28 \
-Provides: perl(overload::numbers) \
-Provides: perl(overloading) = 0.02 \
-Provides: perl(perl5db.pl) \
-Provides: perl(sigtrap) = 1.08 \
-Provides: perl(sort) = 2.02 \
-Provides: perl(subs) = 1.02 \
-Provides: perl(vars) = 1.03 \
-Provides: perl(vmsish) = 1.04 \
-Provides: perl(warnings::register) = 1.04 \
-Provides: perl(x86-64) = 4:5.26.0-392.fc27 \
-%{nil}
-%global gendep_perl_Archive_Tar \
-Requires: perl(:VERSION) >= 5.5.0 \
-Requires: perl(Archive::Tar) \
-Requires: perl(Archive::Tar::Constant) \
-Requires: perl(Archive::Tar::File) \
-Requires: perl(Carp) \
-Requires: perl(Config) \
-Requires: perl(Cwd) \
-Requires: perl(Data::Dumper) \
-Requires: perl(Exporter) \
-Requires: perl(File::Basename) \
-Requires: perl(File::Find) \
-Requires: perl(File::Path) \
-Requires: perl(File::Spec) \
-Requires: perl(File::Spec::Unix) \
-Requires: perl(Getopt::Long) \
-Requires: perl(Getopt::Std) \
-Requires: perl(IO::File) \
-Requires: perl(IO::Handle) \
-Requires: perl(IO::Zlib) \
-Requires: perl(Pod::Usage) \
-Requires: perl(constant) \
-Requires: perl(strict) \
-Requires: perl(vars) \
-Requires: perl(warnings) \
-Provides: perl(Archive::Tar) = 2.24 \
-Provides: perl(Archive::Tar::Constant) = 2.24 \
-Provides: perl(Archive::Tar::File) = 2.24 \
 %{nil}
 %global gendep_perl_Attribute_Handlers \
 Requires: perl(:VERSION) >= 5.6.0 \
@@ -870,6 +626,252 @@ Requires: perl(strict) \
 Requires: perl(warnings) \
 Provides: perl(HTTP::Tiny) = 0.070 \
 %{nil}
+%global gendep_perl_interpreter \
+Requires: perl(:VERSION) >= 5.0.0 \
+Requires: perl(:VERSION) >= 5.10.1 \
+Requires: perl(:VERSION) >= 5.24.0 \
+Requires: perl(:VERSION) >= 5.3.0 \
+Requires: perl(:VERSION) >= 5.5.0 \
+Requires: perl(:VERSION) >= 5.6.0 \
+Requires: perl(:VERSION) >= 5.7.0 \
+Requires: perl(:VERSION) >= 5.7.3 \
+Requires: perl(:VERSION) >= 5.8.0 \
+Requires: perl(:VERSION) >= 5.9.1 \
+Requires: perl(:VERSION) >= 5.9.4 \
+Requires: perl(B) \
+Requires: perl(B::Concise) \
+Requires: perl(B::Op_private) \
+Requires: perl(B::Terse) \
+Requires: perl(Carp) \
+Requires: perl(Class::Struct) \
+Requires: perl(Config) \
+Requires: perl(Cwd) \
+Requires: perl(Exporter) \
+Requires: perl(ExtUtils::Constant::Base) \
+Requires: perl(ExtUtils::Constant::Utils) \
+Requires: perl(ExtUtils::Constant::XS) \
+Requires: perl(Fcntl) \
+Requires: perl(File::Basename) \
+Requires: perl(File::Path) \
+Requires: perl(File::Spec) \
+Requires: perl(File::Spec::Functions) \
+Requires: perl(I18N::LangTags) \
+Requires: perl(IO::File) \
+Requires: perl(IPC::Open3) \
+Requires: perl(Opcode) >= 1.01 \
+Requires: perl(POSIX) \
+Requires: perl(Scalar::Util) >= 1.10 \
+Requires: perl(Symbol) \
+Requires: perl(Text::Tabs) \
+Requires: perl(Text::Wrap) \
+Requires: perl(Tie::Handle) \
+Requires: perl(Tie::Hash) \
+Requires: perl(Tie::StdHandle) \
+Requires: perl(Time::tm) \
+Requires: perl(Unicode::Normalize) \
+Requires: perl(XSLoader) \
+Requires: perl(_charnames) \
+Requires: perl(bytes) \
+Requires: perl(charnames) \
+Requires: perl(constant) \
+Requires: perl(feature) \
+Requires: perl(if) \
+Requires: perl(integer) \
+Requires: perl(overload) \
+Requires: perl(parent) \
+Requires: perl(re) \
+Requires: perl(strict) \
+Requires: perl(subs) \
+Requires: perl(threads) \
+Requires: perl(threads::shared) \
+Requires: perl(unicore::Name) \
+Requires: perl(utf8) \
+Requires: perl(vars) \
+Requires: perl(warnings) \
+Requires: perl(warnings::register) \
+Provides: perl(AnyDBM_File) = 1.01 \
+Provides: perl(AutoLoader) = 5.74 \
+Provides: perl(AutoSplit) = 1.06 \
+Provides: perl(B) = 1.68 \
+Provides: perl(B::Concise) = 0.999 \
+Provides: perl(B::Deparse) = 1.40 \
+Provides: perl(B::OBJECT) \
+Provides: perl(B::Op_private) = 5.026000 \
+Provides: perl(B::Showlex) = 1.05 \
+Provides: perl(B::Terse) = 1.07 \
+Provides: perl(B::Xref) = 1.06 \
+Provides: perl(Benchmark) = 1.22 \
+Provides: perl(Class::Struct) = 0.65 \
+Provides: perl(Class::Struct::Tie_ISA) \
+Provides: perl(Config) = 5.026000 \
+Provides: perl(Config::Extensions) = 0.01 \
+Provides: perl(DB) = 1.08 \
+Provides: perl(DBM_Filter) = 0.06 \
+Provides: perl(DBM_Filter::compress) = 0.03 \
+Provides: perl(DBM_Filter::encode) = 0.03 \
+Provides: perl(DBM_Filter::int32) = 0.03 \
+Provides: perl(DBM_Filter::null) = 0.03 \
+Provides: perl(DBM_Filter::utf8) = 0.03 \
+Provides: perl(DirHandle) = 1.04 \
+Provides: perl(Dumpvalue) = 1.18 \
+Provides: perl(DynaLoader) = 1.42 \
+Provides: perl(EVERY::LAST) \
+Provides: perl(English) = 1.10 \
+Provides: perl(ExtUtils::Constant) = 0.23 \
+Provides: perl(ExtUtils::Constant::Base) = 0.05 \
+Provides: perl(ExtUtils::Constant::ProxySubs) = 0.08 \
+Provides: perl(ExtUtils::Constant::Utils) = 0.03 \
+Provides: perl(ExtUtils::Constant::XS) = 0.03 \
+Provides: perl(Fcntl) = 1.13 \
+Provides: perl(File::Basename) = 2.85 \
+Provides: perl(File::Compare) = 1.1006 \
+Provides: perl(File::Copy) = 2.32 \
+Provides: perl(File::DosGlob) = 1.12 \
+Provides: perl(File::Find) = 1.34 \
+Provides: perl(File::Glob) = 1.28 \
+Provides: perl(File::stat) = 1.07 \
+Provides: perl(FileCache) = 1.09 \
+Provides: perl(FileHandle) = 2.03 \
+Provides: perl(FindBin) = 1.51 \
+Provides: perl(GDBM_File) = 1.15 \
+Provides: perl(Getopt::Std) = 1.12 \
+Provides: perl(Hash::Util) = 0.22 \
+Provides: perl(Hash::Util::FieldHash) = 1.19 \
+Provides: perl(I18N::Collate) = 1.02 \
+Provides: perl(I18N::LangTags) = 0.42 \
+Provides: perl(I18N::LangTags::Detect) = 1.06 \
+Provides: perl(I18N::LangTags::List) = 0.39 \
+Provides: perl(I18N::Langinfo) = 0.13 \
+Provides: perl(IPC::Open2) = 1.04 \
+Provides: perl(IPC::Open3) = 1.20 \
+Provides: perl(NDBM_File) = 1.14 \
+Provides: perl(NEXT) = 0.67 \
+Provides: perl(NEXT::ACTUAL) \
+Provides: perl(NEXT::ACTUAL::DISTINCT) \
+Provides: perl(NEXT::ACTUAL::UNSEEN) \
+Provides: perl(NEXT::DISTINCT) \
+Provides: perl(NEXT::DISTINCT::ACTUAL) \
+Provides: perl(NEXT::UNSEEN) \
+Provides: perl(NEXT::UNSEEN::ACTUAL) \
+Provides: perl(Net::hostent) = 1.01 \
+Provides: perl(Net::netent) = 1.00 \
+Provides: perl(Net::protoent) = 1.00 \
+Provides: perl(Net::servent) = 1.01 \
+Provides: perl(O) = 1.01 \
+Provides: perl(ODBM_File) = 1.14 \
+Provides: perl(Opcode) = 1.39 \
+Provides: perl(POSIX) = 1.76 \
+Provides: perl(POSIX::SigAction) \
+Provides: perl(POSIX::SigRt) \
+Provides: perl(POSIX::SigSet) \
+Provides: perl(PerlIO) = 1.10 \
+Provides: perl(PerlIO::encoding) = 0.25 \
+Provides: perl(PerlIO::mmap) = 0.016 \
+Provides: perl(PerlIO::scalar) = 0.26 \
+Provides: perl(PerlIO::via) = 0.16 \
+Provides: perl(Pod::Functions) = 1.11 \
+Provides: perl(SDBM_File) = 1.14 \
+Provides: perl(Safe) = 2.40 \
+Provides: perl(Search::Dict) = 1.07 \
+Provides: perl(SelectSaver) = 1.02 \
+Provides: perl(Symbol) = 1.08 \
+Provides: perl(Sys::Hostname) = 1.20 \
+Provides: perl(Term::Complete) = 1.403 \
+Provides: perl(Term::ReadLine) = 1.16 \
+Provides: perl(Term::ReadLine::Stub) \
+Provides: perl(Term::ReadLine::TermCap) \
+Provides: perl(Term::ReadLine::Tk) \
+Provides: perl(Text::Abbrev) = 1.02 \
+Provides: perl(Thread) = 3.04 \
+Provides: perl(Thread::Semaphore) = 2.13 \
+Provides: perl(Tie::Array) = 1.06 \
+Provides: perl(Tie::ExtraHash) \
+Provides: perl(Tie::File) = 1.02 \
+Provides: perl(Tie::File::Cache) \
+Provides: perl(Tie::File::Heap) \
+Provides: perl(Tie::Handle) = 4.2 \
+Provides: perl(Tie::Hash) \
+Provides: perl(Tie::Hash) = 1.05 \
+Provides: perl(Tie::Hash::NamedCapture) = 0.10 \
+Provides: perl(Tie::Memoize) = 1.1 \
+Provides: perl(Tie::RefHash) = 1.39 \
+Provides: perl(Tie::RefHash::Nestable) \
+Provides: perl(Tie::Scalar) = 1.04 \
+Provides: perl(Tie::StdArray) \
+Provides: perl(Tie::StdHandle) = 4.4 \
+Provides: perl(Tie::StdHash) \
+Provides: perl(Tie::StdScalar) \
+Provides: perl(Tie::SubstrHash) = 1.00 \
+Provides: perl(Time::gmtime) = 1.03 \
+Provides: perl(Time::localtime) = 1.02 \
+Provides: perl(Time::tm) = 1.00 \
+Provides: perl(UNIVERSAL) = 1.13 \
+Provides: perl(Unicode::UCD) = 0.68 \
+Provides: perl(User::grent) = 1.01 \
+Provides: perl(User::pwent) = 1.00 \
+Provides: perl(_charnames) = 1.44 \
+Provides: perl(arybase) = 0.12 \
+Provides: perl(attributes) = 0.29 \
+Provides: perl(autouse) = 1.11 \
+Provides: perl(base) = 2.25 \
+Provides: perl(blib) = 1.06 \
+Provides: perl(bytes) = 1.05 \
+Provides: perl(bytes_heavy.pl) \
+Provides: perl(charnames) = 1.44 \
+Provides: perl(deprecate) = 0.03 \
+Provides: perl(diagnostics) = 1.36 \
+Provides: perl(dumpvar.pl) \
+Provides: perl(encoding::warnings) = 0.13 \
+Provides: perl(feature) = 1.47 \
+Provides: perl(fields) = 2.23 \
+Provides: perl(filetest) = 1.03 \
+Provides: perl(if) = 0.0606 \
+Provides: perl(less) = 0.03 \
+Provides: perl(lib) = 0.64 \
+Provides: perl(locale) = 1.09 \
+Provides: perl(mro) = 1.20 \
+Provides: perl(ops) = 1.02 \
+Provides: perl(overload) = 1.28 \
+Provides: perl(overload::numbers) \
+Provides: perl(overloading) = 0.02 \
+Provides: perl(perl5db.pl) \
+Provides: perl(sigtrap) = 1.08 \
+Provides: perl(sort) = 2.02 \
+Provides: perl(subs) = 1.02 \
+Provides: perl(vars) = 1.03 \
+Provides: perl(vmsish) = 1.04 \
+Provides: perl(warnings::register) = 1.04 \
+Provides: perl(x86-64) = 4:5.26.0-392.fc27 \
+%{nil}
+%global gendep_perl_Archive_Tar \
+Requires: perl(:VERSION) >= 5.5.0 \
+Requires: perl(Archive::Tar) \
+Requires: perl(Archive::Tar::Constant) \
+Requires: perl(Archive::Tar::File) \
+Requires: perl(Carp) \
+Requires: perl(Config) \
+Requires: perl(Cwd) \
+Requires: perl(Data::Dumper) \
+Requires: perl(Exporter) \
+Requires: perl(File::Basename) \
+Requires: perl(File::Find) \
+Requires: perl(File::Path) \
+Requires: perl(File::Spec) \
+Requires: perl(File::Spec::Unix) \
+Requires: perl(Getopt::Long) \
+Requires: perl(Getopt::Std) \
+Requires: perl(IO::File) \
+Requires: perl(IO::Handle) \
+Requires: perl(IO::Zlib) \
+Requires: perl(Pod::Usage) \
+Requires: perl(constant) \
+Requires: perl(strict) \
+Requires: perl(vars) \
+Requires: perl(warnings) \
+Provides: perl(Archive::Tar) = 2.24 \
+Provides: perl(Archive::Tar::Constant) = 2.24 \
+Provides: perl(Archive::Tar::File) = 2.24 \
+%{nil}
 %global gendep_perl_IO \
 Requires: perl(:VERSION) >= 5.6.0 \
 Requires: perl(Carp) \
@@ -1863,8 +1865,6 @@ Requires: perl(strict) \
 Requires: perl(warnings::register) \
 Provides: perl(constant) = 1.33 \
 %{nil}
-%global gendep_perl_core \
-%{nil}
 %global gendep_perl_debuginfo \
 %{nil}
 %global gendep_perl_devel \
diff --git a/perl.spec b/perl.spec
index caabc1e..4fdb4f5 100644
--- a/perl.spec
+++ b/perl.spec
@@ -35,11 +35,6 @@
 %bcond_without test
 
 Name:           perl
-Version:        %{perl_version}
-# release number must be even higher, because dual-lived modules will be broken otherwise
-Release:        394%{?dist}
-Epoch:          %{perl_epoch}
-Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
 # These are all found licenses. They are distributed among various
 # subpackages.
@@ -77,7 +72,16 @@ Group:          Development/Languages
 # cpan/Compress-Raw-Zlib/zlib-src:      zlib
 ## perl sub-package notice
 # perluniprops.pod is generated from lib/unicore sources:   UCD
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic) and BSD and Public Domain and UCD
+#
+# This sub-subpackage doesn't contain any copyrightable material.
+# Nevertheless, it needs a License tag, so we'll use the generic
+# "perl" license.
+License:        GPL+ or Artistic
+Epoch:          %{perl_epoch}
+Version:        %{perl_version}
+# release number must be even higher, because dual-lived modules will be broken otherwise
+Release:        395%{?dist}
+Summary:        Practical Extraction and Report Language
 Url:            http://www.perl.org/
 Source0:        http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2
 Source3:        macros.perl
@@ -221,46 +225,136 @@ BuildRequires:  rsyslog
 %endif
 %endif
 
-# The long line of Perl provides.
-
 
 # compat macro needed for rebuild
 %global perl_compat perl(:MODULE_COMPAT_5.26.0)
 
-# perl-interpreter denotes a package with the perl executable.
-# Full EVR is for compatibility with systems that swapped perl and perl-core
-# <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>.
-Provides: perl-interpreter = %{perl_epoch}:%{perl_version}-%{release}
-
-# File provides
-Provides: perl(bytes_heavy.pl)
-Provides: perl(dumpvar.pl)
-Provides: perl(perl5db.pl)
-
-# suidperl isn't created by upstream since 5.12.0
-Obsoletes: perl-suidperl <= 4:5.12.2
-
-Requires: perl-libs%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
-# Require this till perl sub-package requires any modules
-Requires: %perl_compat
+Requires:       %perl_compat
+Requires:       perl-interpreter%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
+Requires:       perl-libs%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
+Requires:       perl-devel%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
+Requires:       perl-macros
+Requires:       perl-utils
 %if %{defined perl_bootstrap}
 %gendep_perl
 %endif
 
+Requires:       perl-Archive-Tar, perl-Attribute-Handlers, perl-autodie,
+Requires:       perl-B-Debug, perl-bignum
+Requires:       perl-Compress-Raw-Bzip2,
+Requires:       perl-Carp, perl-Compress-Raw-Zlib, perl-Config-Perl-V,
+Requires:       perl-constant,
+Requires:       perl-CPAN, perl-CPAN-Meta, perl-CPAN-Meta-Requirements,
+Requires:       perl-CPAN-Meta-YAML, perl-Encode, perl-encoding
+Requires:       perl-Data-Dumper, perl-DB_File,
+Requires:       perl-Devel-Peek, perl-Devel-PPPort, perl-Devel-SelfStubber,
+Requires:       perl-Digest, perl-Digest-MD5,
+Requires:       perl-Digest-SHA,
+Requires:       perl-Env, perl-Errno, perl-Exporter, perl-experimental
+Requires:       perl-ExtUtils-CBuilder, perl-ExtUtils-Command,
+Requires:       perl-ExtUtils-Embed,
+Requires:       perl-ExtUtils-Install, perl-ExtUtils-MakeMaker
+Requires:       perl-ExtUtils-Manifest, perl-ExtUtils-Miniperl
+Requires:       perl-ExtUtils-ParseXS, perl-File-Fetch
+Requires:       perl-File-Path, perl-File-Temp, perl-Filter,
+Requires:       perl-Filter-Simple, perl-Getopt-Long
+Requires:       perl-HTTP-Tiny,
+Requires:       perl-IO, perl-IO-Compress, perl-IO-Socket-IP
+Requires:       perl-IO-Zlib, perl-IPC-Cmd, perl-IPC-SysV, perl-JSON-PP
+Requires:       perl-libnet, perl-libnetcfg,
+Requires:       perl-Locale-Codes, perl-Locale-Maketext,
+Requires:       perl-Locale-Maketext-Simple
+Requires:       perl-Math-BigInt, perl-Math-BigInt-FastCalc, perl-Math-BigRat,
+Requires:       perl-Math-Complex, perl-Memoize,
+Requires:       perl-MIME-Base64,
+Requires:       perl-Module-CoreList,
+Requires:       perl-Module-CoreList-tools, perl-Module-Load
+Requires:       perl-Module-Load-Conditional, perl-Module-Loaded,
+Requires:       perl-Module-Metadata, perl-Net-Ping,
+Requires:       perl-open, perl-PathTools
+Requires:       perl-Params-Check
+Requires:       perl-perlfaq,
+Requires:       perl-PerlIO-via-QuotedPrint, perl-Perl-OSType
+Requires:       perl-Pod-Checker, perl-Pod-Escapes, perl-Pod-Html,
+Requires:       perl-Pod-Parser, perl-Pod-Perldoc, perl-Pod-Usage
+Requires:       perl-podlators, perl-Pod-Simple, perl-Scalar-List-Utils
+Requires:       perl-SelfLoader, perl-Socket, perl-Storable, perl-Sys-Syslog,
+Requires:       perl-Term-ANSIColor, perl-Term-Cap,
+Requires:       perl-Test, perl-Test-Harness, perl-Test-Simple
+Requires:       perl-Text-Balanced, perl-Text-ParseWords, perl-Text-Tabs+Wrap,
+Requires:       perl-Thread-Queue
+Requires:       perl-Time-HiRes
+Requires:       perl-Time-Local, perl-Time-Piece
+Requires:       perl-Unicode-Collate, perl-Unicode-Normalize,
+Requires:       perl-version, perl-threads, perl-threads-shared, perl-parent
+
+# Full EVR is for compatibility with systems that swapped perl and perl-core
+# <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>,
+# bug #1464903.
+Provides:       perl-core = %{perl_version}-%{release}
+Provides:       perl-core%{?_isa} = %{perl_version}-%{release}
+# perl was renamed to perl-interpreter and perl-core renamed to perl
+Obsoletes:      perl-core < 5.26.0-395
+
+
+%description
+Perl is a high-level programming language with roots in C, sed, awk and shell
+scripting. Perl is good at handling processes and files, and is especially
+good at handling text. Perl's hallmarks are practicality and efficiency.
+While it is used to do a lot of different things, Perl's most common
+applications are system administration utilities and web programming.
+
+This is a metapackage with all the Perl bits and core modules that can be
+found in the upstream tarball from perl.org.
+
+If you need only a specific feature, you can install a specific package
+instead. E.g. to handle Perl scripts with %{_bindir}/perl interpreter,
+install perl-interpreter package. See perl-interpreter description for more
+details on the Perl decomposition into packages.
+
+
+%package interpreter
+Summary:        Standalone executable Perl interpreter
+Group:          Development/Languages
+License:        (GPL+ or Artistic) and (GPLv2+ or Artistic) and BSD and Public Domain and UCD
+# perl-interpreter denotes a package with the perl executable.
+# Full EVR is for compatibility with systems that swapped perl and perl-core
+# <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>,
+# bug #1464903.
+Version:        %{perl_version}
+Epoch:          %{perl_epoch}
+
+Requires:       perl-libs%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
+# Require this till perl-interpreter sub-package provides any modules
+Requires:       %perl_compat
+%if %{defined perl_bootstrap}
+%gendep_perl_interpreter
+%endif
+
 # We need this to break the dependency loop, and ensure that perl-libs 
-# gets installed before perl.
+# gets installed before perl-interpreter.
 Requires(post): perl-libs
 # Same as perl-libs. We need macros in basic buildroot, where Perl is only
 # because of git.
 Requires(post): perl-macros
 
+# File provides
+Provides:       perl(bytes_heavy.pl)
+Provides:       perl(dumpvar.pl)
+Provides:       perl(perl5db.pl)
 
-%description
-Perl is a high-level programming language with roots in C, sed, awk and shell
-scripting.  Perl is good at handling processes and files, and is especially
-good at handling text.  Perl's hallmarks are practicality and efficiency.
-While it is used to do a lot of different things, Perl's most common
-applications are system administration utilities and web programming.
+# suidperl isn't created by upstream since 5.12.0
+Obsoletes:      perl-suidperl <= 4:5.12.2
+# perl was renamed to perl-interpreter and perl-core renamed to perl
+# <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>,
+# bug #1464903.
+Obsoletes:      perl < 4:5.26.0-395
+
+
+%description interpreter
+This is a Perl interpreter as a standalone executable %{_bindir}/perl
+required for handling Perl scripts. It does not provide all the other Perl
+modules or tools.
 
 Install this package if you want to program in Perl or enable your system to
 handle Perl scripts with %{_bindir}/perl interpreter.
@@ -270,7 +364,7 @@ If your script requires some Perl modules, you can install them with
 "perl(Test::More)" to make Test::More Perl module available.
 
 If you need all the Perl modules that come with upstream Perl sources, so
-called core modules, install perl-core package.
+called core modules, install perl package.
 
 If you only need perl run-time as a shared library, i.e. Perl interpreter
 embedded into another application, the only essential package is perl-libs.
@@ -369,7 +463,7 @@ License:        GPL+ or Artistic
 AutoReqProv:    0
 Requires:       %perl_compat
 # FIXME - note this will need to change when doing the core/minimal swizzle
-Requires:       perl-core
+Requires:       perl
 %if %{defined perl_bootstrap}
 %gendep_perl_tests
 %endif
@@ -402,78 +496,6 @@ perlthanks, pl2pm, and splain. Some utilities are provided by more specific
 packages like perldoc by perl-Pod-Perldoc.
 
 
-%package core
-Summary:        Base perl metapackage
-Group:          Development/Languages
-# This rpm doesn't contain any copyrightable material.
-# Nevertheless, it needs a License tag, so we'll use the generic
-# "perl" license.
-License:        GPL+ or Artistic
-Epoch:          0
-Version:        %{perl_version}
-Requires:       %perl_compat
-Requires:       perl-libs%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
-Requires:       perl-devel%{?_isa} = %{perl_epoch}:%{perl_version}-%{release}
-Requires:       perl-macros
-Requires:       perl-utils
-%if %{defined perl_bootstrap}
-%gendep_perl_core
-%endif
-
-Requires:       perl-Archive-Tar, perl-Attribute-Handlers, perl-autodie,
-Requires:       perl-B-Debug, perl-bignum
-Requires:       perl-Compress-Raw-Bzip2,
-Requires:       perl-Carp, perl-Compress-Raw-Zlib, perl-Config-Perl-V,
-Requires:       perl-constant,
-Requires:       perl-CPAN, perl-CPAN-Meta, perl-CPAN-Meta-Requirements,
-Requires:       perl-CPAN-Meta-YAML, perl-Encode, perl-encoding
-Requires:       perl-Data-Dumper, perl-DB_File,
-Requires:       perl-Devel-Peek, perl-Devel-PPPort, perl-Devel-SelfStubber,
-Requires:       perl-Digest, perl-Digest-MD5,
-Requires:       perl-Digest-SHA,
-Requires:       perl-Env, perl-Errno, perl-Exporter, perl-experimental
-Requires:       perl-ExtUtils-CBuilder, perl-ExtUtils-Command,
-Requires:       perl-ExtUtils-Embed,
-Requires:       perl-ExtUtils-Install, perl-ExtUtils-MakeMaker
-Requires:       perl-ExtUtils-Manifest, perl-ExtUtils-Miniperl
-Requires:       perl-ExtUtils-ParseXS, perl-File-Fetch
-Requires:       perl-File-Path, perl-File-Temp, perl-Filter,
-Requires:       perl-Filter-Simple, perl-Getopt-Long
-Requires:       perl-HTTP-Tiny,
-Requires:       perl-IO, perl-IO-Compress, perl-IO-Socket-IP
-Requires:       perl-IO-Zlib, perl-IPC-Cmd, perl-IPC-SysV, perl-JSON-PP
-Requires:       perl-libnet, perl-libnetcfg,
-Requires:       perl-Locale-Codes, perl-Locale-Maketext,
-Requires:       perl-Locale-Maketext-Simple
-Requires:       perl-Math-BigInt, perl-Math-BigInt-FastCalc, perl-Math-BigRat,
-Requires:       perl-Math-Complex, perl-Memoize,
-Requires:       perl-MIME-Base64,
-Requires:       perl-Module-CoreList,
-Requires:       perl-Module-CoreList-tools, perl-Module-Load
-Requires:       perl-Module-Load-Conditional, perl-Module-Loaded,
-Requires:       perl-Module-Metadata, perl-Net-Ping,
-Requires:       perl-open, perl-PathTools
-Requires:       perl-Params-Check
-Requires:       perl-perlfaq,
-Requires:       perl-PerlIO-via-QuotedPrint, perl-Perl-OSType
-Requires:       perl-Pod-Checker, perl-Pod-Escapes, perl-Pod-Html,
-Requires:       perl-Pod-Parser, perl-Pod-Perldoc, perl-Pod-Usage
-Requires:       perl-podlators, perl-Pod-Simple, perl-Scalar-List-Utils
-Requires:       perl-SelfLoader, perl-Socket, perl-Storable, perl-Sys-Syslog,
-Requires:       perl-Term-ANSIColor, perl-Term-Cap,
-Requires:       perl-Test, perl-Test-Harness, perl-Test-Simple
-Requires:       perl-Text-Balanced, perl-Text-ParseWords, perl-Text-Tabs+Wrap,
-Requires:       perl-Thread-Queue
-Requires:       perl-Time-HiRes
-Requires:       perl-Time-Local, perl-Time-Piece
-Requires:       perl-Unicode-Collate, perl-Unicode-Normalize,
-Requires:       perl-version, perl-threads, perl-threads-shared, perl-parent
-
-%description core
-A metapackage which requires all of the perl bits and modules in the upstream
-tarball from perl.org.
-
-
 %if %{dual_life} || %{rebuild_from_scratch}
 %package Archive-Tar
 Summary:        A module for Perl manipulation of .tar files
@@ -3155,7 +3177,12 @@ popd
 
 %postun libs -p /sbin/ldconfig
 
+# We sub-package modules from perl-interpreter subpackage. Main perl package
+# is a meta package.
 %files
+# Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
+
+%files interpreter
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 %{_bindir}/*
@@ -5144,11 +5171,14 @@ popd
 %{_mandir}/man3/version::Internals.3*
 %endif
 
-%files core
-# Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
-
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Jun 28 2017 Petr Pisar <ppisar@redhat.com> - 4:5.26.0-395
+- perl package installs all core modules, interpreter moved to
+  perl-interpreter package, perl-core package is obsolete
+  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
+  (bug #1464903)
+
 * Mon Jun 19 2017 Petr Pisar <ppisar@redhat.com> - 4:5.26.0-394
 - Make File::Glob more resistant against degenerative matching (RT#131211)
 - Fix a crash when calling a subroutine from a stash (RT#131085)