diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | t/02create_pkgs.t | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -5,6 +5,7 @@ o check that web server has actually started o describe more tests to help pinpoint regressions o do not fail test when libnss.so is not found in Debian 9 or FreeBSD + o fix failing to build some rpms on FreeBSD o fix test with rpm < 4.13 on CentOS7 o make sure genhdlist2 works o perform some file conflict tests only on Mageia diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t index 63a8fc0f..fe118250 100644 --- a/t/02create_pkgs.t +++ b/t/02create_pkgs.t @@ -81,7 +81,9 @@ sub rpmbuild { my $dir = getcwd(); my ($target) = $spec =~ m!-(i586|x86_64)\.spec$!; - system_("rpmbuild --quiet --define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps ".($target ? "--target $target" : "")." $spec"); + # unsetting %__os_install_post fixes failure to build on FreeBSD: + my $nopost = " --define '__os_install_post %nil'"; + system_("rpmbuild --quiet --define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $nopost ".($target ? "--target $target" : "")." $spec"); my ($name) = $spec =~ m!([^/]*)\.spec$!; |