From fd00c408070a1b1c22189e0007d34de242dd6daf Mon Sep 17 00:00:00 2001 From: Stas Sergeev Date: Sat, 30 Dec 2023 11:50:28 +0500 Subject: [PATCH] rpkg: switch to meson --- fdpp.spec.rpkg | 10 ++++++---- rpkg.conf | 2 ++ rpkg.macros | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 rpkg.conf create mode 100644 rpkg.macros diff --git a/fdpp.spec.rpkg b/fdpp.spec.rpkg index 485a32f9..4c1a3634 100644 --- a/fdpp.spec.rpkg +++ b/fdpp.spec.rpkg @@ -12,9 +12,10 @@ Group: System/Emulator License: GPLv3+ URL: https://github.com/dosemu2/fdpp VCS: {{{ git_dir_vcs }}} -Source0: {{{ git_dir_archive }}} +Source0: {{{ dir_pack }}} -BuildRequires: make +BuildRequires: meson +BuildRequires: ninja-build BuildRequires: bison BuildRequires: flex BuildRequires: sed @@ -38,12 +39,13 @@ It is based on a FreeDOS kernel ported to modern C++. {{{ git_dir_setup_macro }}} %build -make PREFIX=%{_prefix} LIBDIR=%{_libdir} %{?_smp_mflags} +./configure.meson build --prefix %{_prefix} --libdir %{_libdir} +meson compile --verbose -C build %{?_smp_mflags} %check %install -make DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} install +meson install -C build --destdir %{buildroot} %files %defattr(-,root,root) diff --git a/rpkg.conf b/rpkg.conf new file mode 100644 index 00000000..957dc058 --- /dev/null +++ b/rpkg.conf @@ -0,0 +1,2 @@ +[rpkg] +user_macros = "${git_props:root}/rpkg.macros" diff --git a/rpkg.macros b/rpkg.macros new file mode 100644 index 00000000..2d368ea0 --- /dev/null +++ b/rpkg.macros @@ -0,0 +1,6 @@ +function dir_pack { + rm -f `find . -name .gitignore` + git clean -fdq + tar zcf fdpp-git.tar.gz . --transform s,^\.[^\.],fdpp/, + echo fdpp-git.tar.gz +}