From cc09288b1983d87e81ddbc05a039e273f2beee21 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Jun 12 2019 15:52:46 +0000 Subject: Install Perl files to a standard Perl path stow stopped building because it used sitelib Perl path that has changed with Fedora's Perl 5.30. This commit fixes the installation by passing the desired path in a --with-pmdir option. This commit also adds missing dependencies. --- diff --git a/stow.spec b/stow.spec index d8151e3..1ff61b0 100644 --- a/stow.spec +++ b/stow.spec @@ -1,6 +1,6 @@ Name: stow Version: 2.2.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: http://www.gnu.org/software/stow/stow.html @@ -8,16 +8,37 @@ Summary: Manage the installation of software packages from source Source: http://ftp.gnu.org/gnu/stow/stow-%{version}.tar.bz2 BuildArch: noarch +BuildRequires: coreutils +BuildRequires: gawk +BuildRequires: grep +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: sed +# Run-time dependencies +BuildRequires: perl(:VERSION) >= 5.6 +BuildRequires: perl(base) +BuildRequires: perl(Carp) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Copy) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Spec) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(POSIX) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) # Test dependencies # Data::Dumper no longer provided by base perl in F18+ -BuildRequires: perl-generators BuildRequires: perl(Data::Dumper) +BuildRequires: perl(English) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Temp) +BuildRequires: perl(IO::Scalar) +BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Output) -BuildRequires: perl(IO::Scalar) -BuildRequires: perl(Carp) -BuildRequires: perl(IO::File) -BuildRequires: perl(Module::Build) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description GNU Stow is a program for managing the installation of software packages, @@ -43,7 +64,7 @@ This package contains the documentation for GNU Stow. %setup -q %build -%configure --docdir=%{moredocs} +%configure --docdir=%{moredocs} --with-pmdir=%{perl_vendorlib} %install rm -rf $RPM_BUILD_ROOT @@ -64,8 +85,8 @@ make check %doc %{_infodir}/stow* %license COPYING %{_bindir}/* -%{_datadir}/perl5/Stow.pm -%{_datadir}/perl5/Stow/ +%{perl_vendorlib}/Stow.pm +%{perl_vendorlib}/Stow/ %files doc %docdir %{moredocs} @@ -75,6 +96,9 @@ make check %changelog +* Wed Jun 12 2019 Petr Pisar - 2.2.2-8 +- Install Perl files to a standard Perl path + * Sun Feb 03 2019 Fedora Release Engineering - 2.2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild