diff --git a/SOURCES/0001-rpm-use-good-old-optflags.patch b/SOURCES/0001-rpm-use-good-old-optflags.patch new file mode 100644 index 00000000..0ea3e05f --- /dev/null +++ b/SOURCES/0001-rpm-use-good-old-optflags.patch @@ -0,0 +1,33 @@ +From a532714cf50f13cb29b0eb86c588f3a7fc6343b0 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 4 Sep 2017 13:03:07 +0200 +Subject: [PATCH 1/2] rpm: use good old %optflags + +Signed-off-by: Igor Gnatenko +--- + data/macros.meson | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/macros.meson b/data/macros.meson +index 732b68d2..9ef19a57 100644 +--- a/data/macros.meson ++++ b/data/macros.meson +@@ -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 -I%_fmoddir}" \ ++ export FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" \ ++ export LDFLAGS="${LDFLAGS:-%__global_ldflags}" \ + %{__meson} \\\ + --buildtype=plain \\\ + --prefix=%{_prefix} \\\ +-- +2.18.0 diff --git a/SOURCES/0002-rpm-pass-auto-features-enabled-skip-ci.patch b/SOURCES/0002-rpm-pass-auto-features-enabled-skip-ci.patch new file mode 100644 index 00000000..80abd1ac --- /dev/null +++ b/SOURCES/0002-rpm-pass-auto-features-enabled-skip-ci.patch @@ -0,0 +1,34 @@ +From 1fd19d9e960bf457c87fa5914e0b11fa2045542c Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 23 Jul 2018 19:24:33 +0200 +Subject: [PATCH 2/2] rpm: pass --auto-features=enabled [skip ci] + +We really want to be explicit. + +Signed-off-by: Igor Gnatenko +(cherry picked from commit 1515fca2d9d4dcc8c9c98689421e69517444c05e) +--- + data/macros.meson | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/macros.meson b/data/macros.meson +index 9ef19a57..792aa215 100644 +--- a/data/macros.meson ++++ b/data/macros.meson +@@ -1,5 +1,6 @@ + %__meson %{_bindir}/meson + %__meson_wrap_mode nodownload ++%__meson_auto_features enabled + + %meson \ + export CFLAGS="${CFLAGS:-%optflags}" \ +@@ -23,6 +24,7 @@ + --localstatedir=%{_localstatedir} \\\ + --sharedstatedir=%{_sharedstatedir} \\\ + --wrap-mode=%{__meson_wrap_mode} \\\ ++ --auto-features=%{__meson_auto_features} \\\ + %{_vpath_srcdir} %{_vpath_builddir} \\\ + %{nil} + +-- +2.18.0 diff --git a/SPECS/meson.spec b/SPECS/meson.spec new file mode 100644 index 00000000..ce158b38 --- /dev/null +++ b/SPECS/meson.spec @@ -0,0 +1,288 @@ +%global libname mesonbuild + +Name: meson +Version: 0.47.2 +Release: 1%{?dist} +Summary: High productivity build system + +License: ASL 2.0 +URL: http://mesonbuild.com/ +Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +Patch0001: 0001-rpm-use-good-old-optflags.patch +Patch0002: 0002-rpm-pass-auto-features-enabled-skip-ci.patch + +BuildArch: noarch +Obsoletes: %{name}-gui < 0.31.0-3 + +BuildRequires: python%{python3_other_pkgversion}-devel +BuildRequires: python%{python3_other_pkgversion}-setuptools +BuildRequires: python3-rpm-macros +BuildRequires: ninja-build +Requires: ninja-build + +%description +Meson is a build system designed to optimize programmer +productivity. It aims to do this by providing simple, out-of-the-box +support for modern software development tools and practices, such as +unit tests, coverage reports, Valgrind, CCache and the like. + +%prep +%autosetup -p1 +find -type f -name '*.py' -executable -exec sed -i -e '1s|.*|#!%{__python3}|' {} ';' +# Macro should not change when we are redefining bindir +sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} + +%build +%py3_other_build + +%install +%py3_other_install +install -Dpm0644 data/macros.%{name} %{buildroot}%{rpmmacrodir}/macros.%{name} + +%files +%license COPYING +%{_bindir}/%{name} +%{_bindir}/%{name}conf +%{_bindir}/%{name}introspect +%{_bindir}/%{name}test +%{_bindir}/wraptool +%{python3_other_sitelib}/%{libname}/ +%{python3_other_sitelib}/%{name}-*.egg-info/ +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}conf.1* +%{_mandir}/man1/%{name}introspect.1* +%{_mandir}/man1/%{name}test.1* +%{_mandir}/man1/wraptool.1* +%{rpmmacrodir}/macros.%{name} +%dir %{_datadir}/polkit-1 +%dir %{_datadir}/polkit-1/actions +%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy + +%changelog +* Sat Aug 25 2018 Igor Gnatenko - 0.47.2-1 +- Update to 0.47.2 + +* Tue Jul 10 2018 Igor Gnatenko - 0.47.1-1 +- Update to 0.47.1 + +* Thu May 17 2018 Igor Gnatenko - 0.46.1-1 +- Update to 0.46.1 + +* Fri Feb 23 2018 Igor Gnatenko - 0.44.1-1 +- Update to 0.44.1 + +* Tue Sep 12 2017 Igor Gnatenko - 0.42.1-1 +- Update to 0.42.1 + +* Mon Sep 04 2017 Igor Gnatenko - 0.42.0-1.1 +- Fix %%meson macro on F25 + +* Fri Aug 18 2017 Igor Gnatenko - 0.42.0-1 +- Update to 0.42.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 0.41.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Igor Gnatenko - 0.41.2-1 +- Update to 0.41.2 + +* Tue Jul 18 2017 Kalev Lember - 0.41.1-3 +- Backport various gtk-doc fixes from upstream + +* Thu Jul 13 2017 Igor Gnatenko - 0.41.1-2 +- Strip trailing slash from pkg-config files + +* Mon Jun 19 2017 Igor Gnatenko - 0.41.1-1 +- Update to 0.41.1 + +* Tue Jun 13 2017 Igor Gnatenko - 0.41.0-1 +- Update to 0.41.0 + +* Wed May 31 2017 Igor Gnatenko - 0.40.1-2 +- Don't run ldc tests + +* Fri Apr 28 2017 Igor Gnatenko - 0.40.1-1 +- Update to 0.40.1 + +* Sun Apr 23 2017 Igor Gnatenko - 0.40.0-1 +- Update to 0.40.0 + +* Thu Apr 13 2017 Igor Gnatenko - 0.39.1-2 +- Exclude ldc for module builds + +* Thu Mar 16 2017 Igor Gnatenko - 0.39.1-1 +- Update to 0.39.1 + +* Mon Mar 06 2017 Igor Gnatenko - 0.39.0-1 +- Update to 0.39.0 + +* Tue Feb 07 2017 Igor Gnatenko - 0.38.1-1 +- Update to 0.38.1 + +* Sun Jan 29 2017 Igor Gnatenko - 0.38.0-1 +- Update to 0.38.0 + +* Thu Dec 22 2016 Miro Hrončok - 0.37.1-2 +- Rebuild for Python 3.6 + +* Tue Dec 20 2016 Igor Gnatenko - 0.37.1-1 +- Update to 0.37.1 + +* Mon Dec 19 2016 Miro Hrončok - 0.37.0-2 +- Rebuild for Python 3.6 + +* Sun Dec 18 2016 Igor Gnatenko - 0.37.0-1 +- Update to 0.37.0 + +* Thu Dec 15 2016 Igor Gnatenko - 0.36.0-4 +- Backport more RPM macro fixes (FPC ticket #655) + +* Tue Dec 13 2016 Igor Gnatenko - 0.36.0-3 +- Backport fixes to RPM macros + +* Sat Dec 03 2016 Igor Gnatenko - 0.36.0-2 +- Print test output during build + +* Mon Nov 14 2016 Igor Gnatenko - 0.36.0-1 +- Update to 0.36.0 + +* Tue Oct 18 2016 Igor Gnatenko - 0.35.1-1 +- Update to 0.35.1 (RHBZ #1385986) + +* Tue Oct 11 2016 Igor Gnatenko - 0.35.0-3 +- Backport couple of fixes + +* Wed Oct 05 2016 Igor Gnatenko - 0.35.0-2 +- Apply patch to fix FTBFS + +* Mon Oct 03 2016 Igor Gnatenko - 0.35.0-1 +- Update to 0.35.0 + +* Wed Sep 07 2016 Igor Gnatenko - 0.34.0-2 +- Run D test suite + +* Wed Sep 07 2016 Igor Gnatenko - 0.34.0-1 +- Update to 0.34.0 + +* Tue Aug 09 2016 Jon Ciesla - 0.33.0-2 +- Obsoletes fix. + +* Tue Aug 09 2016 Jon Ciesla - 0.33.0-1 +- 0.33.0 +- GUI dropped upstream. + +* Tue Jul 19 2016 Fedora Release Engineering - 0.31.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Apr 14 2016 Igor Gnatenko - 0.31.0-1 +- Update to 0.31.0 + +* Sun Mar 20 2016 Igor Gnatenko - 0.30.0-1 +- Update to 0.30.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 0.29.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Jan 24 2016 Igor Gnatenko - 0.29.0-1 +- Update to 0.29.0 + +* Fri Jan 15 2016 Jonathan Wakely - 0.28.0-2 +- Rebuilt for Boost 1.60 + +* Mon Dec 28 2015 Igor Gnatenko - 0.28.0-1 +- 0.28.0 + +* Wed Nov 25 2015 Igor Gnatenko - 0.27.0-1 +- 0.27.0 + +* Tue Nov 10 2015 Fedora Release Engineering - 0.26.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Oct 30 2015 Igor Gnatenko - 0.26.0-2 +- Fix rpm macros for using optflags + +* Sun Sep 13 2015 Igor Gnatenko - 0.26.0-1 +- 0.26.0 + +* Thu Aug 27 2015 Jonathan Wakely - 0.25.0-4 +- Rebuilt for Boost 1.59 + +* Wed Jul 29 2015 Fedora Release Engineering - 0.25.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 0.25.0-2 +- rebuild for Boost 1.58 + +* Sun Jul 12 2015 Igor Gnatenko - 0.25.0-1 +- 0.25.0 + +* Sat Jul 11 2015 Igor Gnatenko - 0.24.0-3 +- Update URLs +- drop unneded hacks in install section +- enable print test output for tests + +* Wed Jun 17 2015 Fedora Release Engineering - 0.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 25 2015 Igor Gnatenko - 0.24.0-1 +- Update to 0.24.0 + +* Thu May 21 2015 Igor Gnatenko - 0.23.0-3.20150328git0ba1d54 +- Update to latest git + +* Thu May 21 2015 Igor Gnatenko - 0.23.0-3 +- Add patch to accept .S files + +* Wed Apr 29 2015 Igor Gnatenko - 0.23.0-2 +- Add python3 to Requires (Thanks to Ilya Kyznetsov) + +* Tue Mar 31 2015 Igor Gnatenko - 0.23.0-1 +- 0.23.0 + +* Sat Mar 28 2015 Igor Gnatenko - 0.22.0-9.20150328git3b49b71 +- Update to latest git + +* Mon Mar 23 2015 Igor Gnatenko - 0.22.0-9.20150325git18550fe +- Update to latest git +- Include mesonintrospect + +* Mon Mar 23 2015 Igor Gnatenko - 0.22.0-9.20150322git78d31ca +- Fix filelists for mesongui (python-bytecode-without-source) + +* Sun Mar 22 2015 Igor Gnatenko - 0.22.0-8.20150322git78d31ca +- Enable C# tests + +* Sun Mar 22 2015 Igor Gnatenko - 0.22.0-7.20150322git78d31ca +- update to latest git +- fix tests on arm + +* Sat Mar 21 2015 Igor Gnatenko - 0.22.0-7.20150321gita084a8e +- update to latest git + +* Mon Mar 16 2015 Igor Gnatenko - 0.22.0-7.20150316gitfa2c659 +- update to latest git + +* Tue Mar 10 2015 Igor Gnatenko - 0.22.0-7.20150310gitf9f51b1 +- today's git snapshot with support for cool GNOME features +- re-enable wxGTK3 tests, package fixed in rawhide + +* Thu Feb 26 2015 Igor Gnatenko - 0.22.0-6.git7581895 +- split gui to subpkg +- update to latest snapshot +- enable tests + +* Thu Feb 26 2015 Igor Gnatenko - 0.22.0-5.gitc6dbf98 +- Fix packaging style +- Make package noarch + +* Mon Feb 23 2015 Igor Gnatenko - 0.22.0-4.git.c6dbf98 +- Use development version + +* Sat Feb 21 2015 Igor Gnatenko - 0.22.0-3 +- Add ninja-build to requires + +* Thu Jan 22 2015 Igor Gnatenko - 0.22.0-2 +- fix shebang in python files + +* Wed Jan 21 2015 Igor Gnatenko - 0.22.0-1 +- Initial package