diff --git a/_service b/_service index fde7902..26ff6b7 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + git https://github.com/openSUSE/rpm-config-SUSE master @@ -7,9 +7,9 @@ enable package/rpm-config-SUSE.spec - + *.tar zst - + diff --git a/_servicedata b/_servicedata index ed84a08..5ee3955 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpm-config-SUSE - c1846d3e05b8b5af68a249fe9b7edc36c336c373 + a5aa36f0f8d4e1d7228c93bacf7271786de5bd29 \ No newline at end of file diff --git a/rpm-config-SUSE-20220317.tar.zst b/rpm-config-SUSE-20220317.tar.zst deleted file mode 100644 index a7a7835..0000000 --- a/rpm-config-SUSE-20220317.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c973f0fcce5e1ecd3654d94fb1a27ed5c37d45e9bfd14f508c3d8a96fb48013d -size 17397 diff --git a/rpm-config-SUSE-20220414.tar.zst b/rpm-config-SUSE-20220414.tar.zst new file mode 100644 index 0000000..ecadae8 --- /dev/null +++ b/rpm-config-SUSE-20220414.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f1e7ab54243cd77af2fbcced14ee2c227af09b46a753cca12fe46d85be44112 +size 18433 diff --git a/rpm-config-SUSE.changes b/rpm-config-SUSE.changes index 0b85cbf..8e68f3c 100644 --- a/rpm-config-SUSE.changes +++ b/rpm-config-SUSE.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 14 12:56:30 UTC 2022 - lnussel@suse.de + +- Update to version 20220414: + * add SBAT values (boo#1193282) + * Explain that rpm-config-SUSE covers also openSUSE + ------------------------------------------------------------------- Fri Mar 18 12:14:16 UTC 2022 - dmueller@suse.com diff --git a/rpm-config-SUSE.spec b/rpm-config-SUSE.spec index a9f1c19..11a59f2 100644 --- a/rpm-config-SUSE.spec +++ b/rpm-config-SUSE.spec @@ -18,7 +18,7 @@ Name: rpm-config-SUSE -Version: 20220317 +Version: 20220414 Release: 0 Summary: SUSE specific RPM configuration files License: GPL-2.0-or-later @@ -32,8 +32,8 @@ Requires: rpm BuildArch: noarch %description -This package contains the RPM configuration data for the SUSE Linux -distribution family. +This package contains the RPM configuration data for the SUSE and +openSUSE distribution families. %prep %setup -q @@ -58,6 +58,20 @@ sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \ %endif < suse_macros.in > suse_macros +cat < macros.d/macros.sbat +# Common SBAT values for secure boot +# https://github.com/rhboot/shim/blob/main/SBAT.md + +%if 0%{?is_opensuse} +%%sbat_distro opensuse +%%sbat_distro_summary The openSUSE Project +%else +%%sbat_distro sle +%%sbat_distro_summary SUSE Linux Enterprise +%endif +%%sbat_distro_url mailto:security@suse.de +EOF + %install # Install SUSE vendor macros and rpmrc mkdir -p %{buildroot}%{_rpmconfigdir}/suse