diff --git a/_service b/_service index 26ff6b7..7f120b9 100644 --- a/_service +++ b/_service @@ -1,15 +1,16 @@ + - - git - https://github.com/openSUSE/rpm-config-SUSE - master - %cd - enable - package/rpm-config-SUSE.spec - - - *.tar - zst - - + + git + https://github.com/openSUSE/rpm-config-SUSE + master + %cd + enable + package/rpm-config-SUSE.spec + + + *.tar + zst + + diff --git a/_servicedata b/_servicedata index e3910ea..8b27819 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpm-config-SUSE - 6c1bd69c467fe85c19544ecd8b17b2c4e47a745a + 24ecc4d44c9108d14ec831b7e23812aa979c0ebb - \ No newline at end of file + diff --git a/rpm-config-SUSE-20240214.tar.zst b/rpm-config-SUSE-20240214.tar.zst deleted file mode 100644 index 470407a..0000000 --- a/rpm-config-SUSE-20240214.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fefe90b155ca13a7db44d3147aeb2c1ed659f6ae85e8c6eabdd77c8bd82692db -size 17914 diff --git a/rpm-config-SUSE-20250904.tar.zst b/rpm-config-SUSE-20250904.tar.zst new file mode 100644 index 0000000..d7dcddd --- /dev/null +++ b/rpm-config-SUSE-20250904.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ef7c018665835795744a367b1c759059807f62b7a697904effc741cd2761d01 +size 18449 diff --git a/rpm-config-SUSE.changes b/rpm-config-SUSE.changes index addd3d6..bf5d009 100644 --- a/rpm-config-SUSE.changes +++ b/rpm-config-SUSE.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Thu Sep 04 09:12:47 UTC 2025 - Michal Suchanek + +- Update to version 20250904: + * kernel.attr: Fix module match regex (bsc#1246561) + * find-provides.ksyms: Support vmlinux in /usr + +------------------------------------------------------------------- +Wed Aug 20 13:22:57 UTC 2025 - Michael Schröder + +- Update to version 20250820: + * Consolidate kernel and KMP fileattrs. + * kmp.attr: Exclude kernel modules from kmp dependency generation (bsc#1246561). + * make %sbat_distro* more robust for different %is_opensuse values (bsc#1247741) + +------------------------------------------------------------------- +Wed Jul 16 11:53:21 UTC 2025 - Michael Schröder + +- Update to version 20250502: + * Add rpm-config-SUSE-reproducible-builds + * Add macro for reproducible-builds + +------------------------------------------------------------------- +Fri Apr 25 08:11:22 UTC 2025 - Dominique Leuenberger + +- Update to version 20250423: + * packaging: replace @leap_version@ in suse_dist_macros.in + * kmp.attr: Run scripts for all modules (bsc#1237308). + +------------------------------------------------------------------- +Fri Mar 28 16:22:44 UTC 2025 - dmueller@suse.com + +- Update to version 20250328: + * Revert "Define %jobs as variable (boo#1237231)" + * Create the directory for rpm macros installation in install + +------------------------------------------------------------------- +Mon Mar 24 12:43:56 UTC 2025 - dmueller@suse.com + +- Update to version 20250324: + * Define %jobs as variable (boo#1237231) + * %requires_eq|ge(): Fix multiline output + * Split the SUSE distribution version macros to a separate file + +------------------------------------------------------------------- +Thu Oct 31 09:33:24 UTC 2024 - dmueller@suse.com + +- Update to version 20241031: + * Merge in changes that already happened in the package + +------------------------------------------------------------------- +Thu Oct 31 09:28:52 UTC 2024 - dmueller@suse.com + +- Update to version 20241031: + * Drop {set,verify}_permissions macros + * Strip the explicit /bin/bash dependency for ksym macros + * locale.prov: handle glibc-locale-base (boo#1221250) + * lang_package: Add 'basename' option + * %requires_eq|ge(): Report error if package version cannot be determined + ------------------------------------------------------------------- Thu Aug 8 04:09:24 UTC 2024 - Bernhard Wiedemann diff --git a/rpm-config-SUSE.spec b/rpm-config-SUSE.spec index 857e05f..4ba0dd6 100644 --- a/rpm-config-SUSE.spec +++ b/rpm-config-SUSE.spec @@ -1,7 +1,7 @@ # # spec file for package rpm-config-SUSE # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # Copyright (c) 2018 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -17,8 +17,10 @@ # +# ignore the explicit bash requires from the kernel mod scripts +%define __requires_exclude ^/bin/bash$ Name: rpm-config-SUSE -Version: 20240214 +Version: 20250904 Release: 0 Summary: SUSE specific RPM configuration files License: GPL-2.0-or-later @@ -35,6 +37,13 @@ BuildArch: noarch This package contains the RPM configuration data for the SUSE and openSUSE distribution families. +%package reproducible-builds +Summary: RPM macros for reproducible-builds + +%description reproducible-builds +This package contains the RPM macros for normalizing +more details about a build (e.g. buildhost, buildtime) + %prep %setup -q @@ -43,6 +52,7 @@ openSUSE distribution families. sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \ -e 's/@sles_version@/%{?sles_version}%{!?sles_version:0}/' \ -e 's/@ul_version@/%{?ul_version}%{!?ul_version:0}/' \ + -e 's/@leap_version@/%{?leap_version}%{!?leap_version:0}/' \ -e '/@is_opensuse@%{?is_opensuse:nomatch}/d' \ -e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \ %if 0%{?is_opensuse} @@ -51,7 +61,7 @@ sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \ %else -e '/@sle_version@/d' \ %endif - < suse_macros.in > suse_macros + < suse_dist_macros.in > macros.d/macros.susedist %if 0%{?is_opensuse} # use latest build date of BuildRequires as reference and go to January 1st three years back - the + 6 * 3600 is to match exactly the previous value of 2020-01-01 00:00 as leap-years cause some hours of offset @@ -66,8 +76,8 @@ EOF %install # Install SUSE vendor macros and rpmrc -mkdir -p %{buildroot}%{_rpmconfigdir}/suse -cp -a suse_macros %{buildroot}%{_rpmconfigdir}/suse/macros +install -d -m 0755 %{buildroot}%{_rpmconfigdir} +cp -a suse %{buildroot}%{_rpmconfigdir} # Install vendor dependency generators cp -a fileattrs %{buildroot}%{_rpmconfigdir} @@ -79,6 +89,7 @@ cp -a macros.d %{buildroot}%{_rpmconfigdir} %doc README.md %{_rpmconfigdir}/suse/ %{_rpmconfigdir}/macros.d/macros.* +%exclude %{_rpmconfigdir}/macros.d/macros.reproducible-builds %{_rpmconfigdir}/fileattrs/* %{_rpmconfigdir}/brp-suse %{_rpmconfigdir}/firmware.prov @@ -89,4 +100,7 @@ cp -a macros.d %{buildroot}%{_rpmconfigdir} %{_rpmconfigdir}/find-requires.ksyms %{_rpmconfigdir}/find-supplements.ksyms +%files reproducible-builds +%{_rpmconfigdir}/macros.d/macros.reproducible-builds + %changelog