fixes to macros.meson patch [release 0.45.1-3mamba;Sun Apr 15 2018]

This commit is contained in:
Silvan Calarco 2024-01-06 07:06:34 +01:00
parent 4b78d1aa33
commit ca5d71b3b0
2 changed files with 22 additions and 5 deletions

View File

@ -1,5 +1,6 @@
--- meson-0.45.1/data/macros.meson.orig 2018-03-22 15:23:16.000000000 +0100
+++ meson-0.45.1/data/macros.meson 2018-03-29 15:53:59.659386285 +0200
diff -Nru meson-0.45.1.orig/data/macros.meson meson-0.45.1/data/macros.meson
--- meson-0.45.1.orig/data/macros.meson 2018-03-22 15:23:16.000000000 +0100
+++ meson-0.45.1/data/macros.meson 2018-04-15 08:13:43.129362331 +0200
@@ -2,11 +2,11 @@
%__meson_wrap_mode nodownload
@ -17,7 +18,7 @@
%{__meson} \\\
--buildtype=plain \\\
--prefix=%{_prefix} \\\
@@ -23,7 +23,7 @@
@@ -23,17 +23,17 @@
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
--wrap-mode=%{__meson_wrap_mode} \\\
@ -26,3 +27,16 @@
%{nil}
%meson_build \
- %ninja_build -C %{_vpath_builddir}
+ ninja -C build
%meson_install \
- %ninja_install -C %{_vpath_builddir}
+ ninja install -C build
%meson_test \
- %ninja_test -C %{_vpath_builddir} || \
+ ninja test -C build || \
( rc=$?; \
echo "-----BEGIN TESTLOG-----"; \
cat %{_vpath_builddir}/meson-logs/testlog.txt; \

View File

@ -1,6 +1,6 @@
Name: meson
Version: 0.45.1
Release: 2mamba
Release: 3mamba
Summary: The Meson Build System
Group: Development/Tools
Vendor: openmamba
@ -27,7 +27,7 @@ The Meson Build System.
%prep
%setup -q
%patch0 -p1
#%patch0 -p1
%build
CFLAGS="%{optflags}" %{__python36} setup.py build
@ -56,6 +56,9 @@ install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson
%doc COPYING
%changelog
* Sun Apr 15 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 0.45.1-3mamba
- fixes to macros.meson patch
* Thu Mar 29 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 0.45.1-2mamba
- install rpm macros.meson file