diff --git a/_servicedata b/_servicedata index eb37683..1836a59 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpm-config-SUSE - 67216a33c1500cb5e86caf86c55dbf053eee6be1 + cfb8c73877ce339a722f13c8dfa1786f04468f04 \ No newline at end of file diff --git a/rpm-config-SUSE-20220926.tar.zst b/rpm-config-SUSE-20220926.tar.zst deleted file mode 100644 index 929c96c..0000000 --- a/rpm-config-SUSE-20220926.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc263db9e3569b284fcaae641c1756d6adec7e5d9866b2e8cabd03f9c1ec9b45 -size 17659 diff --git a/rpm-config-SUSE-20230712.tar.zst b/rpm-config-SUSE-20230712.tar.zst new file mode 100644 index 0000000..0045bef --- /dev/null +++ b/rpm-config-SUSE-20230712.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab38f13695089d75d467cc5422f25df23e52e17d933e581c71d72fab5a149460 +size 17798 diff --git a/rpm-config-SUSE.changes b/rpm-config-SUSE.changes index 7045583..98f4c11 100644 --- a/rpm-config-SUSE.changes +++ b/rpm-config-SUSE.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jul 12 12:25:55 UTC 2023 - lnussel@suse.de + +- Update to version 20230712: + * Add more prjconf macros + * update comment about _lto_cflags + * drop %usrmerged macro (boo#1206798) + * Fix SLE sbat macros used on Leap (bsc#1198458) + ------------------------------------------------------------------- Mon Sep 26 12:46:42 UTC 2022 - lnussel@suse.de diff --git a/rpm-config-SUSE.spec b/rpm-config-SUSE.spec index 8c7eec5..ca5fa8d 100644 --- a/rpm-config-SUSE.spec +++ b/rpm-config-SUSE.spec @@ -1,7 +1,7 @@ # # spec file for package rpm-config-SUSE # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2018 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: rpm-config-SUSE -Version: 20220926 +Version: 20230712 Release: 0 Summary: SUSE specific RPM configuration files License: GPL-2.0-or-later @@ -45,11 +45,6 @@ sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \ -e 's/@ul_version@/%{?ul_version}%{!?ul_version:0}/' \ -e '/@is_opensuse@%{?is_opensuse:nomatch}/d' \ -e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \ -%if 0%{?usrmerged} - -e 's/@usrmerged@/%{?usrmerged}/' \ -%else - -e '/@usrmerged@/d' \ -%endif %if 0%{?is_opensuse} -e '/@sle_version@%{?sle_version:nomatch}/d' \ -e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \ @@ -66,20 +61,6 @@ cat < macros.d/macros.opensuse EOF %endif -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