diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-26 16:38:01 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-29 14:45:37 +0200 |
| commit | 9bdd99afee76630ee6de7bdf61f63bd0b487a2eb (patch) | |
| tree | 84931ff8d4dbd8ab29a635779ab3310ae7665f9f | |
| parent | ed9000014bdd876cb4a71d670277d091e50900f2 (diff) | |
| download | urpmi-9bdd99afee76630ee6de7bdf61f63bd0b487a2eb.tar urpmi-9bdd99afee76630ee6de7bdf61f63bd0b487a2eb.tar.gz urpmi-9bdd99afee76630ee6de7bdf61f63bd0b487a2eb.tar.bz2 urpmi-9bdd99afee76630ee6de7bdf61f63bd0b487a2eb.tar.xz urpmi-9bdd99afee76630ee6de7bdf61f63bd0b487a2eb.zip | |
%find_lang sometimes fails on FreeBSD
+ /usr/local/lib/rpm/find-lang.sh /usr/home/cpansand/.cpan/build/2020042613/urpmi-v8.121.20-6/t/tmp/BUILDROOT/various-1-1.x86_64 test-various
error: Bad exit status from /usr/home/cpansand/.cpan/build/2020042613/urpmi-v8.121.20-6/t/tmp/rpm-tmp.kKrrdT (%install)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | t/data/SPECS/various.spec | 6 | ||||
| -rw-r--r-- | t/data/SPECS/various2.spec | 6 | ||||
| -rw-r--r-- | t/data/SPECS/various3.spec | 6 |
4 files changed, 19 insertions, 0 deletions
@@ -12,6 +12,7 @@ o perform some file conflict tests only on Mageia o try harder to find genhdlist2 in uninstalled CPAN modules o work without glibc-static-devel + o workaround %find_lang sometimes failing on FreeBSD - testsuite: o add more extensive tests o describe it more diff --git a/t/data/SPECS/various.spec b/t/data/SPECS/various.spec index 4429fada..250f737c 100644 --- a/t/data/SPECS/various.spec +++ b/t/data/SPECS/various.spec @@ -13,13 +13,19 @@ echo foo > foo rm -rf $RPM_BUILD_ROOT for i in /etc/test-%{name} \ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \ +%ifos linux /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \ +%endif /usr/test-%{name}/foo; do mkdir -p `dirname $RPM_BUILD_ROOT$i` echo foo > $RPM_BUILD_ROOT$i done +%ifos linux %find_lang test-%{name} +%else +echo > test-%{name}.lang +%endif %clean rm -rf $RPM_BUILD_ROOT diff --git a/t/data/SPECS/various2.spec b/t/data/SPECS/various2.spec index d7c55421..6a10084c 100644 --- a/t/data/SPECS/various2.spec +++ b/t/data/SPECS/various2.spec @@ -13,13 +13,19 @@ echo foo > foo rm -rf $RPM_BUILD_ROOT for i in /etc/test-%{name} \ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \ +%ifos linux /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \ +%endif /usr/test-%{name}/foo; do mkdir -p `dirname $RPM_BUILD_ROOT$i` echo foo > $RPM_BUILD_ROOT$i done +%ifos linux %find_lang test-%{name} +%else +echo > test-%{name}.lang +%endif %clean rm -rf $RPM_BUILD_ROOT diff --git a/t/data/SPECS/various3.spec b/t/data/SPECS/various3.spec index f018ab25..74e08459 100644 --- a/t/data/SPECS/various3.spec +++ b/t/data/SPECS/various3.spec @@ -13,13 +13,19 @@ echo foo > foo rm -rf $RPM_BUILD_ROOT for i in /etc/test-%{name} \ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \ +%ifos linux /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \ +%endif /usr/test-%{name}/foo; do mkdir -p `dirname $RPM_BUILD_ROOT$i` echo foo > $RPM_BUILD_ROOT$i done +%ifos linux %find_lang test-%{name} +%else +echo > test-%{name}.lang +%endif %clean rm -rf $RPM_BUILD_ROOT |