summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-01-08 09:23:32 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-04-09 17:50:35 +0200
commitfb259d8223f79c37e8024d70f144ed612be4b74e (patch)
tree7a4bbd6c9f118291d175d2e3d04ae0a0580ce173
parentacebdccc970491ca7f76af97cd6350428d64e239 (diff)
downloadurpmi-fb259d8223f79c37e8024d70f144ed612be4b74e.tar
urpmi-fb259d8223f79c37e8024d70f144ed612be4b74e.tar.gz
urpmi-fb259d8223f79c37e8024d70f144ed612be4b74e.tar.bz2
urpmi-fb259d8223f79c37e8024d70f144ed612be4b74e.tar.xz
urpmi-fb259d8223f79c37e8024d70f144ed612be4b74e.zip
cpan-testers: fix an error on FreeBSD
commit 1089a6c113c53cd77147808ebeb4f6d0ef03fa89 really was about silencing a warning, so let's not break other OSes who do not have that lib or not in this location
-rw-r--r--NEWS1
-rw-r--r--t/data/SPECS/rpm-query-in-scriptlet.spec2
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index cc4182b5..faa64907 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@
o actually needs perl >= 5.10 for //= operator
o fix a test with rpm < 4.13.0
o fix failing scriptlets test with rpm < 4.13.0
+ o fix looking for non existing libnss.so on FreeBSD
o fix testsuite errors on CentOs (NVR vs NVRA)
o include /usr/local/bin in PATH
o require a newer enough Test::More & rpmtools
diff --git a/t/data/SPECS/rpm-query-in-scriptlet.spec b/t/data/SPECS/rpm-query-in-scriptlet.spec
index f7e28f91..2df8c227 100644
--- a/t/data/SPECS/rpm-query-in-scriptlet.spec
+++ b/t/data/SPECS/rpm-query-in-scriptlet.spec
@@ -13,7 +13,9 @@ x
%install
rm -rf %buildroot
# Fix a testsuite warning ("warning: %post(rpm-query-in-scriptlet-1-1.x86_64) scriptlet failed" b/c of: "error: Failed to initialize NSS library")
+%ifos linux
echo %{_libdir}/libnss3.so > list
+%endif
# Find out needed deps:
for i in sh rpm; do