From 280cc404cc6bccc8603d9cc04c1d324681ccdb285ebad9812494f4c6a28c3690 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 12 Mar 2018 23:03:07 +0000 Subject: [PATCH 1/3] Accepting request 586086 from GNOME:Next - Add libjpeg-devel BuildRequires to test testsuite. - Add libjpeg-devel BuildRequires to test testsuite. OBS-URL: https://build.opensuse.org/request/show/586086 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=78 --- meson-testsuite.changes | 5 +++++ meson-testsuite.spec | 1 + meson.changes | 5 +++++ meson.spec | 1 + 4 files changed, 12 insertions(+) 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..0b5fc66 100644 --- a/meson.spec +++ b/meson.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 From bb6d6607c3c305ba28c3f355275fff49d9caffdefd21a1bae13aa0ad2f089ff9 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 16 Mar 2018 00:17:26 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=79 --- meson.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.spec b/meson.spec index 0b5fc66..27d271b 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 @@ -79,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 @@ -141,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 @@ -175,7 +175,11 @@ python3 run_tests.py %endif %files +%if 0%{?suse_version} >= 1500 %license COPYING +%else +%doc COPYING +%endif %if !%{testsuite} %{_bindir}/meson %{_bindir}/mesonconf From 13e5fe6beddf62550d0ffb9b245f8fb7bbbe640e7182fbcc8f056129b9de9895 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 16 Mar 2018 00:21:33 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=80 --- meson.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meson.spec b/meson.spec index 27d271b..cf8ddf1 100644 --- a/meson.spec +++ b/meson.spec @@ -175,11 +175,7 @@ python3 run_tests.py %endif %files -%if 0%{?suse_version} >= 1500 %license COPYING -%else -%doc COPYING -%endif %if !%{testsuite} %{_bindir}/meson %{_bindir}/mesonconf