diff --git a/meson-0.45.1-rpm-macros.path b/meson-0.45.1-rpm-macros.path new file mode 100644 index 0000000..81029b3 --- /dev/null +++ b/meson-0.45.1-rpm-macros.path @@ -0,0 +1,28 @@ +--- 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 +@@ -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,7 +23,7 @@ + --localstatedir=%{_localstatedir} \\\ + --sharedstatedir=%{_sharedstatedir} \\\ + --wrap-mode=%{__meson_wrap_mode} \\\ +- %{_vpath_srcdir} %{_vpath_builddir} \\\ ++ . build \\\ + %{nil} + + %meson_build \ diff --git a/meson.spec b/meson.spec index e5fa3a6..cf540c1 100644 --- a/meson.spec +++ b/meson.spec @@ -1,6 +1,6 @@ Name: meson Version: 0.45.1 -Release: 1mamba +Release: 2mamba Summary: The Meson Build System Group: Development/Tools Vendor: openmamba @@ -9,6 +9,7 @@ Packager: Silvan Calarco 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 License: Apache License 2.0 ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -16,6 +17,7 @@ BuildRequires: libpython36-devel BuildRequires: python-pathlib-py3 Requires: python-pathlib-py3 Requires: python36 >= %python36_version +Requires: ninja BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -25,6 +27,7 @@ The Meson Build System. %prep %setup -q +%patch0 -p1 %build CFLAGS="%{optflags}" %{__python36} setup.py build @@ -40,6 +43,8 @@ CFLAGS="%{optflags}" %{__python36} setup.py build sed -i "s,.*/man/.*,&.gz," %{name}.filelist +install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson + %find_lang %{name} || touch %{name}.lang %clean @@ -47,9 +52,13 @@ sed -i "s,.*/man/.*,&.gz," %{name}.filelist %files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) +%{_sysconfdir}/rpm/macros.meson %doc COPYING %changelog +* Thu Mar 29 2018 Silvan Calarco 0.45.1-2mamba +- install rpm macros.meson file + * Thu Mar 22 2018 Automatic Build System 0.45.1-1mamba - automatic version update by autodist