automatic version update by autodist [release 0.48.1-1mamba;Sun Nov 04 2018]
This commit is contained in:
parent
5a770ad88a
commit
5117ad56b6
@ -1,43 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
%meson \
|
|
||||||
- export CFLAGS="${CFLAGS:-%__global_cflags}" \
|
|
||||||
- export CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" \
|
|
||||||
- export FFLAGS="${FFLAGS:-%__global_fflags}" \
|
|
||||||
- export FCFLAGS="${FCFLAGS:-%__global_fcflags}" \
|
|
||||||
- export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \
|
|
||||||
+ export CFLAGS="${CFLAGS:-%optflags}" \
|
|
||||||
+ export CXXFLAGS="${CXXFLAGS:-%optflags}" \
|
|
||||||
+ export FFLAGS="${FFLAGS:-%optflags}" \
|
|
||||||
+ export FCFLAGS="${FCFLAGS}" \
|
|
||||||
+ export LDFLAGS="${LDFLAGS}" \
|
|
||||||
%{__meson} \\\
|
|
||||||
--buildtype=plain \\\
|
|
||||||
--prefix=%{_prefix} \\\
|
|
||||||
@@ -23,17 +23,18 @@
|
|
||||||
--localstatedir=%{_localstatedir} \\\
|
|
||||||
--sharedstatedir=%{_sharedstatedir} \\\
|
|
||||||
--wrap-mode=%{__meson_wrap_mode} \\\
|
|
||||||
- %{_vpath_srcdir} %{_vpath_builddir} \\\
|
|
||||||
+ . build \\\
|
|
||||||
%{nil}
|
|
||||||
|
|
||||||
%meson_build \
|
|
||||||
- %ninja_build -C %{_vpath_builddir}
|
|
||||||
+ ninja -C build
|
|
||||||
|
|
||||||
%meson_install \
|
|
||||||
- %ninja_install -C %{_vpath_builddir}
|
|
||||||
+ export DESTDIR="%{buildroot}" \
|
|
||||||
+ 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; \
|
|
11
meson-0.48.1-rpm-macros.patch
Normal file
11
meson-0.48.1-rpm-macros.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- meson-0.48.1/data/macros.meson.orig 2018-11-04 13:34:49.857088806 +0100
|
||||||
|
+++ meson-0.48.1/data/macros.meson 2018-11-04 15:46:13.664975652 +0100
|
||||||
|
@@ -1,6 +1,8 @@
|
||||||
|
%__meson %{_bindir}/meson
|
||||||
|
%__meson_wrap_mode nodownload
|
||||||
|
%__meson_auto_features enabled
|
||||||
|
+%_vpath_builddir %{_target_platform}
|
||||||
|
+%_vpath_srcdir .
|
||||||
|
|
||||||
|
%meson \
|
||||||
|
%set_build_flags \
|
@ -1,5 +1,5 @@
|
|||||||
Name: meson
|
Name: meson
|
||||||
Version: 0.47.2
|
Version: 0.48.1
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: The Meson Build System
|
Summary: The Meson Build System
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -9,7 +9,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
|||||||
URL: http://mesonbuild.com/
|
URL: http://mesonbuild.com/
|
||||||
## GITSOURCE https://github.com/mesonbuild/meson.git 0.43.0
|
## GITSOURCE https://github.com/mesonbuild/meson.git 0.43.0
|
||||||
Source: https://github.com/mesonbuild/meson.git/%{version}/meson-%{version}.tar.bz2
|
Source: https://github.com/mesonbuild/meson.git/%{version}/meson-%{version}.tar.bz2
|
||||||
Patch0: meson-0.47.1-rpm-macros.patch
|
Patch0: meson-0.48.1-rpm-macros.patch
|
||||||
License: Apache License 2.0
|
License: Apache License 2.0
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
## AUTOBUILDREQ-END
|
## AUTOBUILDREQ-END
|
||||||
@ -56,6 +56,9 @@ install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson
|
|||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Nov 04 2018 Automatic Build System <autodist@mambasoft.it> 0.48.1-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Sun Aug 26 2018 Automatic Build System <autodist@mambasoft.it> 0.47.2-1mamba
|
* Sun Aug 26 2018 Automatic Build System <autodist@mambasoft.it> 0.47.2-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user