fix rpm-macros patch to pass DESTDIR in meson_install [release 0.47.1-2mamba;Mon Aug 13 2018]
This commit is contained in:
parent
4ee384fac9
commit
af643e75cd
@ -18,7 +18,7 @@ diff -Nru meson-0.45.1.orig/data/macros.meson meson-0.45.1/data/macros.meson
|
||||
%{__meson} \\\
|
||||
--buildtype=plain \\\
|
||||
--prefix=%{_prefix} \\\
|
||||
@@ -23,17 +23,17 @@
|
||||
@@ -23,17 +23,18 @@
|
||||
--localstatedir=%{_localstatedir} \\\
|
||||
--sharedstatedir=%{_sharedstatedir} \\\
|
||||
--wrap-mode=%{__meson_wrap_mode} \\\
|
||||
@ -32,6 +32,7 @@ diff -Nru meson-0.45.1.orig/data/macros.meson meson-0.45.1/data/macros.meson
|
||||
|
||||
%meson_install \
|
||||
- %ninja_install -C %{_vpath_builddir}
|
||||
+ export DESTDIR="%{buildroot}" \
|
||||
+ ninja install -C build
|
||||
|
||||
%meson_test \
|
@ -1,6 +1,6 @@
|
||||
Name: meson
|
||||
Version: 0.47.1
|
||||
Release: 1mamba
|
||||
Release: 2mamba
|
||||
Summary: The Meson Build System
|
||||
Group: Development/Tools
|
||||
Vendor: openmamba
|
||||
@ -9,7 +9,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://mesonbuild.com/
|
||||
## GITSOURCE https://github.com/mesonbuild/meson.git 0.43.0
|
||||
Source: https://github.com/mesonbuild/meson.git/%{version}/meson-%{version}.tar.bz2
|
||||
Patch0: meson-0.45.1-rpm-macros.path
|
||||
Patch0: meson-0.47.1-rpm-macros.patch
|
||||
License: Apache License 2.0
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
## AUTOBUILDREQ-END
|
||||
@ -56,6 +56,9 @@ install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson
|
||||
%doc COPYING
|
||||
|
||||
%changelog
|
||||
* Mon Aug 13 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 0.47.1-2mamba
|
||||
- fix rpm-macros patch to pass DESTDIR in meson_install
|
||||
|
||||
* Thu Jul 12 2018 Automatic Build System <autodist@mambasoft.it> 0.47.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user