diff --git a/macros.perl b/macros.perl index 755eadc..1e634c3 100644 --- a/macros.perl +++ b/macros.perl @@ -94,19 +94,17 @@ for i in ${all_dir[@]}; do\ if [ "${i}" = "auto" ]; then\ continue\ fi\ - if [ "%{perl_vendorlib}/${i}" = "%{perl_vendorarch}" -o "%{perl_vendorlib}/${i}" = "%{perl_vendorarch}/auto" ]; then\ + if [ "%{perl_vendorlib}/${i}" = "%{perl_vendorarch}/auto" ]; then\ continue\ else\ if [ -d ${base_dir}/${i} ]; then\ - RES=`find "${base_dir}/${i}" -maxdepth 1 -type f`\ - if [ -n "$RES" ]; then\ - fgen_dir "%{perl_vendorlib}/${i}"\ - for file in $RES; do\ - fgen_file "%{perl_vendorlib}/${i}/$(basename ${file})"\ - done\ - else\ + if [ "%{perl_vendorlib}/${i}" != "%{perl_vendorarch}" ]; then\ fgen_dir "%{perl_vendorlib}/${i}"\ fi\ + RES=`find "${base_dir}/${i}" -maxdepth 1 -type f`\ + for file in $RES; do\ + fgen_file "%{perl_vendorlib}/${i}/$(basename ${file})"\ + done\ fi\ fi\ done\ diff --git a/perl.changes b/perl.changes index 73707ec..663fda7 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 2 13:03:27 CEST 2018 - mls@suse.de + +- simplify perl_gen_filelist macro + ------------------------------------------------------------------- Fri Sep 28 16:06:46 CEST 2018 - mls@suse.de