From d9480fa44640de84a638af6a83923083d5328a27 Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Thu, 30 Mar 2023 05:29:01 +0000 Subject: [PATCH] autoconf dependency fix Signed-off-by: jcsiadal --- .../dev-tools/autoconf/SPECS/autoconf.spec | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/components/dev-tools/autoconf/SPECS/autoconf.spec b/components/dev-tools/autoconf/SPECS/autoconf.spec index 6d59320e4b..8d01303285 100644 --- a/components/dev-tools/autoconf/SPECS/autoconf.spec +++ b/components/dev-tools/autoconf/SPECS/autoconf.spec @@ -24,11 +24,18 @@ Source0: https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz BuildRequires: m4 make Requires: m4 +BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(File::Compare) BuildRequires: perl(File::Copy) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Text::ParseWords) +%if 0%{?suse_version} || 0%{?sle_version} +Requires: perl-base +%else +Requires: perl-interpreter +%endif +Requires: perl(File::Compare) %define install_path %{OHPC_UTILS}/autotools @@ -48,15 +55,20 @@ may be configuring software with an Autoconf-generated script; Autoconf is only required for the generation of the scripts, not their use. + %prep %setup -q -n autoconf-%{version} + %build %ifarch ppc64le cp /usr/lib/rpm/config.guess build-aux %endif -./configure --prefix=%{install_path} || { cat config.log && exit 1; } +./configure --prefix=%{install_path} \ + --libdir=%{install_path}/lib \ + || { cat config.log && exit 1; } + %install make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install @@ -64,21 +76,21 @@ make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install # remove share/info/dir to avoid conflict with other package installs rm -f $RPM_BUILD_ROOT/%{install_path}/share/info/dir -%{__mkdir_p} ${RPM_BUILD_ROOT}/%{_docdir} +mkdir -p ${RPM_BUILD_ROOT}/%{_docdir} + %files -%dir %{OHPC_HOME} -%{OHPC_UTILS} +%{OHPC_UTILS}/autotools %doc THANKS %doc NEWS %doc ChangeLog.2 %doc ChangeLog -%doc COPYING +%license COPYING %doc ChangeLog.3 %doc README %doc AUTHORS -%doc COPYINGv3 +%license COPYINGv3 %doc ChangeLog.0 %doc ChangeLog.1 %doc TODO -%doc COPYING.EXCEPTION +%license COPYING.EXCEPTION