diff --git a/_servicedata b/_servicedata index 497dd69..e0b975c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/permissions.git - 0f100169e4f8602bc90231db383568e58be66609 \ No newline at end of file + ceaf1aa2a54de49f590ef80fd6a5fa68a16448a0 \ No newline at end of file diff --git a/permissions-1699_20240305.tar.xz b/permissions-1699_20240305.tar.xz deleted file mode 100644 index 4203518..0000000 --- a/permissions-1699_20240305.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:835366bfcc27181c89361163edcbd31cbce9a4babe9d2dd4e509dd51e473fbb2 -size 47420 diff --git a/permissions-1699_20240307.tar.xz b/permissions-1699_20240307.tar.xz new file mode 100644 index 0000000..26c9a09 --- /dev/null +++ b/permissions-1699_20240307.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6085c6cf441ca8d8b402ed2e0ee9e5324d4131bf71bb93a5d2a355765860e47 +size 47532 diff --git a/permissions.changes b/permissions.changes index d72c839..8371318 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 11 12:14:10 UTC 2024 - matthias.gerstner@suse.com + +- Update to version 1699_20240307: + * build system: migrate from Makefile to Meson +- adjust spec file to meson build + ------------------------------------------------------------------- Tue Mar 05 14:37:57 UTC 2024 - filippo.bonazzi@suse.com diff --git a/permissions.spec b/permissions.spec index 00938ab..23d6754 100644 --- a/permissions.spec +++ b/permissions.spec @@ -17,7 +17,7 @@ Name: permissions -Version: 1699_20240305 +Version: 1699_20240307 Release: 0 Summary: SUSE Linux Default Permissions # Maintained in github by the security team. @@ -29,6 +29,7 @@ Source2: permissions.rpmlintrc BuildRequires: gcc-c++ BuildRequires: libcap-devel BuildRequires: libcap-progs +BuildRequires: meson BuildRequires: python-rpm-macros BuildRequires: tclap # test suite @@ -41,10 +42,11 @@ Provides: aaa_base:%{_datadir}/permissions %autosetup %build -make %{?_smp_mflags} CXXFLAGS="%{optflags}" +%meson +%meson_build %install -%make_install fillupdir=%{_fillupdir} +%meson_install # Fix shebang in scripts: Remove dependency on /usr/bin/python3, # making scripts to depends on the real python3 binary, not the link. # (bsc#1212476) @@ -56,7 +58,7 @@ done %check # will fail on qemu with unshare: unshare failed: Invalid argument %if !0%{?qemu_user_space_build} -tests/regtest.py --skip-make > /dev/null +tests/regtest.py --skip-build %_vpath_builddir >/dev/null %endif %description