From a04fc6dd9c2847ff0c8a2bb9357ceb664f7d6a4d67a0e22e54edf285ce17c10d Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 18 Sep 2017 13:06:47 +0000 Subject: [PATCH 1/3] Accepting request 527002 from GNOME:Next - do not use a variable in the Name: tag: SLE's checkin scripts still can't handle that. - Rebase meson-fix-gcc48.patch (boo#1057701). - do not use a variable in the Name: tag: SLE's checkin scripts still can't handle that. OBS-URL: https://build.opensuse.org/request/show/527002 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=60 --- meson-testsuite.changes | 11 +++++++++++ meson-testsuite.spec | 16 ++++++++-------- meson.changes | 6 ++++++ meson.spec | 16 ++++++++-------- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 037fbb6..eb2e868 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 18 11:16:01 UTC 2017 - dimstar@opensuse.org + +- do not use a variable in the Name: tag: SLE's checkin scripts + still can't handle that. + +------------------------------------------------------------------- +Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru + +- Rebase meson-fix-gcc48.patch (boo#1057701). + ------------------------------------------------------------------- Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org diff --git a/meson-testsuite.spec b/meson-testsuite.spec index f8654d5..3c44eb9 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -1,5 +1,5 @@ # -# spec file for package meson-testsuite +# spec file for package meson # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -17,13 +17,13 @@ %define testsuite 1 -%if %{testsuite} -%define name_ext -testsuite -%else -%define name_ext %nil -%endif %define _name mesonbuild -Name: meson%{name_ext} + +%if ! 0%{?testsuite} +Name: meson +%else +Name: meson-testsuite +%endif Version: 0.42.0 Release: 0 Summary: Python-based build system @@ -90,7 +90,7 @@ Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim diff --git a/meson.changes b/meson.changes index c01bb74..eb2e868 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 18 11:16:01 UTC 2017 - dimstar@opensuse.org + +- do not use a variable in the Name: tag: SLE's checkin scripts + still can't handle that. + ------------------------------------------------------------------- Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index 929f53d..d1d9e90 100644 --- a/meson.spec +++ b/meson.spec @@ -1,5 +1,5 @@ # -# spec file for package meson-testsuite +# spec file for package meson # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -17,13 +17,13 @@ %define testsuite 0 -%if %{testsuite} -%define name_ext -testsuite -%else -%define name_ext %nil -%endif %define _name mesonbuild -Name: meson%{name_ext} + +%if ! 0%{?testsuite} +Name: meson +%else +Name: meson-testsuite +%endif Version: 0.42.0 Release: 0 Summary: Python-based build system @@ -90,7 +90,7 @@ Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim From 5e572ee2546574a9e3d3e735451ef61a09f7cfdbb92f43433a7f9bd79bf65a19 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 18 Sep 2017 13:20:48 +0000 Subject: [PATCH 2/3] Accepting request 527028 from devel:tools:building Revert the last change - the TW bot is not happy with it OBS-URL: https://build.opensuse.org/request/show/527028 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=61 --- meson-testsuite.changes | 11 ----------- meson-testsuite.spec | 14 +++++++------- meson.changes | 6 ------ meson.spec | 14 +++++++------- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/meson-testsuite.changes b/meson-testsuite.changes index eb2e868..037fbb6 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 18 11:16:01 UTC 2017 - dimstar@opensuse.org - -- do not use a variable in the Name: tag: SLE's checkin scripts - still can't handle that. - -------------------------------------------------------------------- -Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru - -- Rebase meson-fix-gcc48.patch (boo#1057701). - ------------------------------------------------------------------- Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org diff --git a/meson-testsuite.spec b/meson-testsuite.spec index 3c44eb9..f8654d5 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -1,5 +1,5 @@ # -# spec file for package meson +# spec file for package meson-testsuite # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -17,13 +17,13 @@ %define testsuite 1 -%define _name mesonbuild - -%if ! 0%{?testsuite} -Name: meson +%if %{testsuite} +%define name_ext -testsuite %else -Name: meson-testsuite +%define name_ext %nil %endif +%define _name mesonbuild +Name: meson%{name_ext} Version: 0.42.0 Release: 0 Summary: Python-based build system @@ -90,7 +90,7 @@ Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} +%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim diff --git a/meson.changes b/meson.changes index eb2e868..c01bb74 100644 --- a/meson.changes +++ b/meson.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 18 11:16:01 UTC 2017 - dimstar@opensuse.org - -- do not use a variable in the Name: tag: SLE's checkin scripts - still can't handle that. - ------------------------------------------------------------------- Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index d1d9e90..929f53d 100644 --- a/meson.spec +++ b/meson.spec @@ -1,5 +1,5 @@ # -# spec file for package meson +# spec file for package meson-testsuite # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -17,13 +17,13 @@ %define testsuite 0 -%define _name mesonbuild - -%if ! 0%{?testsuite} -Name: meson +%if %{testsuite} +%define name_ext -testsuite %else -Name: meson-testsuite +%define name_ext %nil %endif +%define _name mesonbuild +Name: meson%{name_ext} Version: 0.42.0 Release: 0 Summary: Python-based build system @@ -90,7 +90,7 @@ Java, Rust. Build definitions are written in a non-turing complete Domain Specific Language. %package vim -%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} +%{!?vim_data_dir:%global vim_data_dir %_datadir/vim} Summary: Vim support for meson.build files Group: Productivity/Text/Editors Requires: vim From 4a9fbde692f106934b950244d4f3f47cac1e83b7137eb873b9c8eb962ee42269 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 2 Oct 2017 20:37:24 +0000 Subject: [PATCH 3/3] Accepting request 530514 from home:jdelvare:branches:devel:tools:building Update to version 0.42.1. This is a stable update with various bug fixes. OBS-URL: https://build.opensuse.org/request/show/530514 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=62 --- meson-0.42.0.tar.gz | 3 --- meson-0.42.0.tar.gz.asc | 16 ---------------- meson-0.42.1.tar.gz | 3 +++ meson-0.42.1.tar.gz.asc | 16 ++++++++++++++++ meson-testsuite.changes | 11 +++++++++++ meson-testsuite.spec | 2 +- meson.changes | 6 ++++++ meson.spec | 2 +- 8 files changed, 38 insertions(+), 21 deletions(-) delete mode 100644 meson-0.42.0.tar.gz delete mode 100644 meson-0.42.0.tar.gz.asc create mode 100644 meson-0.42.1.tar.gz create mode 100644 meson-0.42.1.tar.gz.asc diff --git a/meson-0.42.0.tar.gz b/meson-0.42.0.tar.gz deleted file mode 100644 index 9132a19..0000000 --- a/meson-0.42.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a74c7387a3dd8171e931bcd948355f7f9529368eae72c3c22a9beef6c2e73498 -size 1042872 diff --git a/meson-0.42.0.tar.gz.asc b/meson-0.42.0.tar.gz.asc deleted file mode 100644 index e1a8bac..0000000 --- a/meson-0.42.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlmSJ8oACgkQO/RpO/7r -lCgKkg//c6HJQIqczqH94wTG03bTgLYH2nLUYXMCGd59GIsBTw9g73loEDhJyKze -+95yqos3+e61YGQntzHPpH8eFkWLPk9YdfiAw6MTlZi7Ko4FBAD7yppg/ed+5DG4 -N6Xx2HE8Fd/vWqn/rTlTMIhLiwpJgSecAQJTNoGxPQS5J+y8te1/TCovd6zt5yUu -VlHQD1vtQsXRYYVdM5JhRsHwog4NzcujuFZ46ISMZ4vtWJwGg0uGfIpgmTO+/zQa -KBln7fqShf/jOHohHwc+7thiKgWWPcClyiHpuN3k/AoClyysB0QhmKhBbHNT4IS/ -rRxC5MHOfR+0qjU1+oJY3xP7coPd6uJYe6rWkl/du8ngkgwP6XIIbD0GDJ2EOhT4 -8P8pNO2KfRFH2cdSOqlonhJEqpaePqvP4tSOg+Rjl/iSdgUQdkliKZzqqAwvszGJ -BMFIs+z0+jl8+QPJ7xsCjVkZ3O1kaCGBeZxPtaLoCLbPDcBBCcEu0I7tI1VORzWa -hGszd3afUA+cf5H7Zw4QSTEm1CT75yzjlumNbG9tb5AHUkEQidFpoy3ghf0oyfsy -2sDPehkBYG1DTP/3n8sC7v4sg8ttQt0nDyuwN9PGaYxPbvsI0SXeY8rPx6bq06w8 -2tLtFQNgIXGqUxPLqCFt/t9XCXYH4yBcC1w+3MGJyi7ANvVkw2E= -=vQUx ------END PGP SIGNATURE----- diff --git a/meson-0.42.1.tar.gz b/meson-0.42.1.tar.gz new file mode 100644 index 0000000..a547b8c --- /dev/null +++ b/meson-0.42.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b +size 1044794 diff --git a/meson-0.42.1.tar.gz.asc b/meson-0.42.1.tar.gz.asc new file mode 100644 index 0000000..7362a8b --- /dev/null +++ b/meson-0.42.1.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlm4FwMACgkQO/RpO/7r +lCgKZw/8DJULItDbOaYeYm8jxlwHBJI13R9I0C84u2MRI88vEhffxAkM/r3K0bK+ +6KE2VMtpWXxAdvq0Zfb4Q9xn6o+iMkY4W7TMiR6A6bf2xdShvARKom50xzltLVsR +V0KNJLQYrVBugcqWRgKtRoP2An3b9W731o24mydX4vxndisU9kLqiQScbIDz2BRf +k+4moaEIf/lFFgTXYRuWSopBNRzPY+foQqTMlIv8hS2ZULf90r3s1hc3LBDMCwYT +rDsED4NZc4tdI3ajK094U9n4U8sI/s3xDeghZXiMgsgpdOpevR+XQDP0HRMdMEQc +YOzHjSXwlVjsmKPts9KWKPBRbqjagKj2oN+npkZDWrWYNN9+obKJmhe5Fx4tgkaP +zgCWeSxlvBpHN1GiRsjvmIf87CjlWbRV1PwACSgU4fduXqsNySE+7EM4b6FAGEJ1 +3r4CfxHVi11mMmeUy70OAly3pLNd6CFQRzJ4sN8n1srqpp/i+b1y9CAobar2L75a +81gQzpYZOfOsCxUt2G8e+/4FKaHc8mz3vssEKovi+bRvJsGwKu5L5OwpZAdLiqJc +Ky2p9k+wjUH1EY2UIoHtG1hYCO/LM5Vg4l6SpVuHIOrKOlSqQ+fTjukBaMwB5Px9 +i2sCWlj0Ktl/bG3AMRf8PnEVM6xkskt//UIEjozKbN8eO8VRPjE= +=kzfF +-----END PGP SIGNATURE----- diff --git a/meson-testsuite.changes b/meson-testsuite.changes index 037fbb6..9e77eab 100644 --- a/meson-testsuite.changes +++ b/meson-testsuite.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Oct 2 14:53:40 CEST 2017 - jdelvare@suse.com + +- Update to version 0.42.1. This is a stable update with various + bug fixes. + +------------------------------------------------------------------- +Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru + +- Rebase meson-fix-gcc48.patch (boo#1057701). + ------------------------------------------------------------------- Tue Aug 15 11:00:02 UTC 2017 - dimstar@opensuse.org diff --git a/meson-testsuite.spec b/meson-testsuite.spec index f8654d5..dad1481 100644 --- a/meson-testsuite.spec +++ b/meson-testsuite.spec @@ -24,7 +24,7 @@ %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.42.0 +Version: 0.42.1 Release: 0 Summary: Python-based build system License: Apache-2.0 diff --git a/meson.changes b/meson.changes index c01bb74..9e77eab 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 2 14:53:40 CEST 2017 - jdelvare@suse.com + +- Update to version 0.42.1. This is a stable update with various + bug fixes. + ------------------------------------------------------------------- Fri Sep 8 12:22:38 UTC 2017 - sor.alexei@meowr.ru diff --git a/meson.spec b/meson.spec index 929f53d..beec17a 100644 --- a/meson.spec +++ b/meson.spec @@ -24,7 +24,7 @@ %endif %define _name mesonbuild Name: meson%{name_ext} -Version: 0.42.0 +Version: 0.42.1 Release: 0 Summary: Python-based build system License: Apache-2.0