diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 871d5c2..cc89153 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 12 22:04:53 UTC 2018 - dimstar@opensuse.org + +- Add libjpeg-devel BuildRequires to test testsuite. + ------------------------------------------------------------------- Mon Mar 5 17:00:19 UTC 2018 - dimstar@opensuse.org diff --git a/meson-testsuite.spec b/meson-testsuite.spec index 8296fe9..70d043b 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -55,6 +55,7 @@ BuildRequires: gnustep-make BuildRequires: googletest-devel BuildRequires: gtk-doc BuildRequires: itstool +BuildRequires: libjpeg-devel BuildRequires: libpcap-devel BuildRequires: libwmf-devel BuildRequires: llvm-devel diff --git a/meson.changes b/meson.changes index 871d5c2..cc89153 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 12 22:04:53 UTC 2018 - dimstar@opensuse.org + +- Add libjpeg-devel BuildRequires to test testsuite. + ------------------------------------------------------------------- Mon Mar 5 17:00:19 UTC 2018 - dimstar@opensuse.org diff --git a/meson.spec b/meson.spec index 6e04e38..cf8ddf1 100644 --- a/meson.spec +++ b/meson.spec @@ -39,7 +39,7 @@ Patch0: meson-suse-ify-macros.patch Patch1: meson-fix-gcc48.patch # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package. Patch100: meson-test-installed-bin.patch -BuildRequires: python3 >= 3.4 +BuildRequires: python3 BuildArch: noarch %if %{testsuite} BuildRequires: bison @@ -55,6 +55,7 @@ BuildRequires: gnustep-make BuildRequires: googletest-devel BuildRequires: gtk-doc BuildRequires: itstool +BuildRequires: libjpeg-devel BuildRequires: libpcap-devel BuildRequires: libwmf-devel BuildRequires: llvm-devel @@ -78,7 +79,7 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(zlib) -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 BuildRequires: libboost_log-devel BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel @@ -140,7 +141,7 @@ sed -i '1{/\/usr\/bin\/env/d;}' ./mesonbuild/rewriter.py %build # If this is the test suite, we don't need anything else but the meson package -%if ! %{testsuite} +%if !%{testsuite} python3 setup.py build %else # Ensure we have no mesonbuild / meson in CWD, thus guaranteeing we use meson in $PATH