From 8424241ebdea1e07b852c0d77d6520d51b35b7f4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 24 Apr 2020 08:11:31 +0200
Subject: simplify: BSD support -L but not --dereference

This might help the following failure:
http://www.cpantesters.org/cpan/report/c8c690aa-8587-11ea-81c4-93681f24ea8f
cpio: Can't lstat /bin/sh:
cpio: Can't lstat /usr/local/bin/rpm:
---
 t/data/SPECS/ordering-scriptlets/a_1.spec | 7 +------
 t/data/SPECS/rpm-query-in-scriptlet.spec  | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 't')

diff --git a/t/data/SPECS/ordering-scriptlets/a_1.spec b/t/data/SPECS/ordering-scriptlets/a_1.spec
index fc34d27f..41776692 100644
--- a/t/data/SPECS/ordering-scriptlets/a_1.spec
+++ b/t/data/SPECS/ordering-scriptlets/a_1.spec
@@ -36,14 +36,9 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/bin/
 cp a $RPM_BUILD_ROOT/bin/a
 
-%ifos linux
-%global cpio_opts --dereference
-%else
-%global cpio_opts %nil
-%endif
 # Install the wanted libs if not static:
 ldd a | sed -e 's/^[ \t]*//' -e 's/.* => //' -e 's/ .*//' > list
-grep '/' list | (cd / ; cpio -pumd %cpio_opts %buildroot)
+grep '/' list | (cd / ; cpio -pumdL %buildroot)
 find %buildroot
 
 %clean
diff --git a/t/data/SPECS/rpm-query-in-scriptlet.spec b/t/data/SPECS/rpm-query-in-scriptlet.spec
index 630d036d..0ed59ecd 100644
--- a/t/data/SPECS/rpm-query-in-scriptlet.spec
+++ b/t/data/SPECS/rpm-query-in-scriptlet.spec
@@ -24,13 +24,8 @@ for i in sh rpm; do
    ldd $bin | sed -e 's/^[ \t]*//' -e 's/.* => //' -e 's/ .*//' >> list
 done
 
-%ifos linux
-%global cpio_opts --dereference
-%else
-%global cpio_opts %nil
-%endif
 # Install the wanted tools and their deps:
-grep '/' list | (cd / ; cpio -pumd %cpio_opts %buildroot)
+grep '/' list | (cd / ; cpio -pumdL %buildroot)
 
 # prelinked libraries/binaries cause rpm to abort installation on
 # md5sum errors while package signature does be OK :-( :
-- 
cgit v1.2.1