Project

General

Profile

« Previous | Next » 

Revision 793362a0

Added by Benoît PECCATTE about 6 years ago

Fixes #12184: Wrong dependencies in agent rpm in 4.3

View differences:

rudder-agent/SOURCES/filter-reqs.pl
# - 1) the string "true" or "false" to tell us whether to *not* exclude LMDB from list of requires (ie, if argument == false, then exclude it)
# - 2) The command and it's arguments to run to auto-detect requirements (original RPM behaviour)
my $dont_exclude_tc = $ARGV[0];
my @command = @ARGV[1 .. $#ARGV];
my $system_perl = $ARGV[1];
my @command = @ARGV[2 .. $#ARGV];
# This will run the original find-requires script
# and then remove requirements we don't want
......
my $list = join('', <IN>);
# Apply our exclude filters
$list =~ s/perl//mg if($system_perl eq "true");
$list =~ s/^perl\(.*?$//mg;
$list =~ s/^perl .*?$//mg;
$list =~ s/^\/opt\/rudder\/bin\/perl.*?$//mg;
rudder-agent/SPECS/rudder-agent.spec
# Use our own dependency generator
%global _use_internal_dependency_generator 0
%global __find_requires_orig %{__find_requires}
%define __find_requires %{_sourcedir}/filter-reqs.pl %{use_system_lmdb} %{__find_requires_orig}
%define __find_requires %{_sourcedir}/filter-reqs.pl %{use_system_lmdb} %{use_system_perl} %{__find_requires_orig}
%global __find_provides_orig %{__find_provides}
%define __find_provides %{_sourcedir}/filter-reqs.pl %{use_system_lmdb} %{__find_provides_orig}
%define __find_provides %{_sourcedir}/filter-reqs.pl %{use_system_lmdb} %{use_system_perl} %{__find_provides_orig}
%endif
%description

Also available in: Unified diff