From b5ed443eb943e7a1bba37ec4620e9ccc1785a063796444f78de65f5454dbdb1b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 16 Sep 2024 07:10:34 +0000 Subject: [PATCH] Use a deterministic %_binarychangelogtrim based on build times of BuildRequires (boo#1047218) OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm-config-SUSE?expand=0&rev=71 --- .gitattributes | 23 +++ .gitignore | 1 + _service | 15 ++ _servicedata | 6 + rpm-config-SUSE-20240214.tar.zst | 3 + rpm-config-SUSE.changes | 266 +++++++++++++++++++++++++++++++ rpm-config-SUSE.spec | 92 +++++++++++ 7 files changed, 406 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _service create mode 100644 _servicedata create mode 100644 rpm-config-SUSE-20240214.tar.zst create mode 100644 rpm-config-SUSE.changes create mode 100644 rpm-config-SUSE.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_service b/_service new file mode 100644 index 0000000..26ff6b7 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + git + https://github.com/openSUSE/rpm-config-SUSE + master + %cd + enable + package/rpm-config-SUSE.spec + + + *.tar + zst + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..e3910ea --- /dev/null +++ b/_servicedata @@ -0,0 +1,6 @@ + + + https://github.com/openSUSE/rpm-config-SUSE + 6c1bd69c467fe85c19544ecd8b17b2c4e47a745a + + \ No newline at end of file diff --git a/rpm-config-SUSE-20240214.tar.zst b/rpm-config-SUSE-20240214.tar.zst new file mode 100644 index 0000000..470407a --- /dev/null +++ b/rpm-config-SUSE-20240214.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fefe90b155ca13a7db44d3147aeb2c1ed659f6ae85e8c6eabdd77c8bd82692db +size 17914 diff --git a/rpm-config-SUSE.changes b/rpm-config-SUSE.changes new file mode 100644 index 0000000..addd3d6 --- /dev/null +++ b/rpm-config-SUSE.changes @@ -0,0 +1,266 @@ +------------------------------------------------------------------- +Thu Aug 8 04:09:24 UTC 2024 - Bernhard Wiedemann + +- Use a deterministic binarychangelogtrim + based on build times of BuildRequires (boo#1047218) + +------------------------------------------------------------------- +Wed Feb 14 16:22:28 UTC 2024 - valentin.lefebvre@suse.com + +- Update to version 20240214: + * set_permissions: handle chkstat failure more grateful (bsc#1219736) + +------------------------------------------------------------------- +Thu Jan 18 15:25:55 UTC 2024 - lnussel@suse.com + +- Update to version 20240118: + * find-provides.ksyms: Fix ksym provides on Tumbleweed/ALP + +------------------------------------------------------------------- +Mon Jan 15 13:31:52 UTC 2024 - lnussel@suse.com + +- Update to version 20240115: + * macros.initrd: %regenerate_initrd_post: don't fail if mkdir is unavailable + * scripts: Do full ksyms dependencies on Tumbleweed (bsc#1215015) + +------------------------------------------------------------------- +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 + +- Update to version 20220926: + * Revert macros.debuginfo and prefer a direct rpm patch + * Fix kernel builds after #59 + * Redefine %__debug_install_post to simplify debuginfo setup + * Fix bug not using custom name for summary and description in language packages (boo#1137381) + +------------------------------------------------------------------- +Thu Apr 21 12:53:35 UTC 2022 - dmueller@suse.com + +- Update to version 20220421: + * Automatically trim opensuse changelogs to the last 3 years + * use zstd for tarball compression + +------------------------------------------------------------------- +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 + +- Update to version 20220317: + * set buildshell to use bash + +------------------------------------------------------------------- +Sun Feb 06 15:23:31 UTC 2022 - dmueller@suse.com + +- Update to version 0.g96: + * changes + * Avoid bash specific construct + +------------------------------------------------------------------- +Wed Jan 19 15:18:16 UTC 2022 - lnussel@suse.de + +- Update to version 0.g93: + * locale.attr: Match all files inside LC_MESSAGES (boo#1194865) + * remove leap_version as it's obsolete + +------------------------------------------------------------------- +Thu Oct 21 10:33:43 UTC 2021 - lnussel@suse.de + +- Update to version 0.g89: + * find-provides.ksyms: Do not set IFS - it is not needed for anything. + * find-provides.ksyms: Fix compressed modules. + * Allow locale directory to be named "locales" too + +------------------------------------------------------------------- +Fri Jun 25 13:45:53 UTC 2021 - lnussel@suse.de + +- Update to version 0.g83: + * Find kernel modules also in /usr/lib/modules + +------------------------------------------------------------------- +Wed Jun 23 12:39:18 UTC 2021 - gmbr3@opensuse.org + +- Update to version 0.g81: + * Support ZSTD compressed kernel modules + * Fix a typo: povides -> provides + * Quote %buildroot in makeinstall macros + +------------------------------------------------------------------- +Fri Mar 05 15:52:55 UTC 2021 - lnussel@suse.de + +- Update to version 0.g76: + * Prepare usrmerge (boo#1029961) + * scripts/find-provides.ksyms: Handle XZ compressed kernel (boo#1179251). + * find-requires.ksyms: use "if kernel" conditional for modules-load.d + * find-requires.ksyms: actually generate modules-load.d dependencies + * find-requires.ksyms: Silence the awk warning + * find-provides.ksyms: Fix kernel version test + * find-provides.ksyms: Fix ksym-provides test + +------------------------------------------------------------------- +Mon Oct 26 12:14:50 UTC 2020 - lnussel@suse.de + +- Update to version 0.g64: + * Define a global %_firmwaredir + * macros.obs: remove unused macros + +------------------------------------------------------------------- +Mon Aug 31 08:06:43 UTC 2020 - lnussel@suse.de + +- Update to version 0.g60: + * Add VPATH macros from RH/Fedora to make upstream Meson macros work + * Don't limit locale match to /usr/share/locale + +------------------------------------------------------------------- +Sun Mar 22 13:32:49 UTC 2020 - kukuk@suse.com + +- Update to version 0.g56: + * Remove grep and diffutils from fillup_prereq, replace coreutils with file requires + * Avoid overwriting files that didn't actually change on disk + +------------------------------------------------------------------- +Thu Jan 30 10:33:42 UTC 2020 - dimstar@opensuse.org + +- Update to version 0.g52: + * Make deprecated %install_info not fail when used within if/fi construct + +------------------------------------------------------------------- +Fri Dec 27 14:00:15 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 0.g50: + * Add missing changelog entries and fix authors + * Add ldconfig_scriptlets macros for RH/Fedora compatibility + * move %install_info to file triggers (boo#1152105) + +------------------------------------------------------------------- +Wed Nov 06 09:45:08 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 0.g45: + * Use -flto=auto for _lto_cflags for now + +------------------------------------------------------------------- +Tue Oct 29 10:26:17 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 0.g44: + * Sync specfile changes + * Add _lto_cflags to suse_macros for now + +------------------------------------------------------------------- +Wed Oct 16 09:07:52 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 0.g42: + * Add __perl macro until the perl package provides it + * Add requires_eq and requires_ge macros + +------------------------------------------------------------------- +Wed Sep 25 09:16:39 UTC 2019 - lnussel@suse.de + +- Update to version 0.g40: + * locale.prov: also work with -locale packages + * locale.prov: discard input in error case + +------------------------------------------------------------------- +Thu Sep 19 08:20:36 UTC 2019 - lnussel@suse.de + +- Update to version 0.g37: + * Add macros for locale provides + +------------------------------------------------------------------- +Wed Aug 28 12:12:34 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 0.g35: + * Add _distconfdir as /usr/etc + * find-provides.ksyms, find-requires.ksyms: cleanup kernel version handling (bsc#1145601). + * find-requires.ksyms: fix matching of uninstalled files (bsc#1145601). + * add changes + +------------------------------------------------------------------- +Thu Aug 15 17:53:05 UTC 2019 - msuchanek@suse.de + +- Update to version 0.g32: + * find-provides.ksyms, find-requires.ksyms: cleanup kernel version handling (bsc#1145601). + * find-requires.ksyms: fix matching of uninstalled files (bsc#1145601). + +------------------------------------------------------------------- +Wed Aug 14 11:25:25 UTC 2019 - dimstar@opensuse.org + +- Update to version 0.g29: + * find-requires.ksyms: Move modinfo and modprobe before the ksym dependency code. + +------------------------------------------------------------------- +Tue Jun 18 13:25:45 UTC 2019 - Takashi Iwai + +- Add support for compressed firmware files +- Add support for compressed kernel modules + +------------------------------------------------------------------- +Fri May 17 10:37:23 UTC 2019 - Martin Wilck + +- macros: avoid emitting bashisms into scriptlets + +------------------------------------------------------------------- +Thu Apr 25 16:15:13 UTC 2019 - Michal Suchanek + +- Provide/require modules with .ko suffix (jsc#SLE-3853) + +------------------------------------------------------------------- +Wed Apr 10 09:59:33 CEST 2019 - kukuk@suse.de + +- Don't use bash syntax in %install_info macro [bsc#1131957] + +------------------------------------------------------------------- +Tue Mar 5 16:05:14 UTC 2019 - Michal Suchanek + +- Add automatic kernel module requires for module-load.d files + (FATE#326579). + +------------------------------------------------------------------- +Wed Jan 30 13:57:55 CET 2019 - mls@suse.de + +- Added macros.d/macros.initrd + +------------------------------------------------------------------- +Tue Dec 18 20:10:04 UTC 2018 - Michal Suchanek + +- Add kmod(module) provides to kernel and KMPs (FATE#326579). + +------------------------------------------------------------------- +Wed Oct 24 16:10:40 CEST 2018 - msuchanek@suse.de + +- Fix superfluous TOC. dependency (bsc#1113100) + +------------------------------------------------------------------- +Fri Oct 12 14:17:05 UTC 2018 - Jan Engelhardt + +- Update to new snapshot 0.g8 + * %lang_package: fix "empty Requires:" being emitted + * %user_group_add: do not ignore errors from useradd + +------------------------------------------------------------------- +Wed Sep 5 11:57:46 UTC 2018 - Jan Engelhardt + +- Update to new snapshot 0.g5 + * Modified %lang_package to not inject -n when -r is given. + +------------------------------------------------------------------- +Sat Aug 18 09:38:18 UTC 2018 - schwab@suse.de + +- Break build cycle with rpm + +------------------------------------------------------------------- +Mon Feb 26 03:48:20 UTC 2018 - Neal Gompa + +- Initial split of RPM vendor configuration from rpm package + diff --git a/rpm-config-SUSE.spec b/rpm-config-SUSE.spec new file mode 100644 index 0000000..857e05f --- /dev/null +++ b/rpm-config-SUSE.spec @@ -0,0 +1,92 @@ +# +# spec file for package rpm-config-SUSE +# +# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2018 Neal Gompa . +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: rpm-config-SUSE +Version: 20240214 +Release: 0 +Summary: SUSE specific RPM configuration files +License: GPL-2.0-or-later +Group: System/Packages +URL: https://github.com/openSUSE/rpm-config-SUSE +Source: %{name}-%{version}.tar.zst +BuildRequires: zstd +#!BuildIgnore: rpm-config-SUSE +# RPM owns the directories we need +Requires: rpm +BuildArch: noarch + +%description +This package contains the RPM configuration data for the SUSE and +openSUSE distribution families. + +%prep +%setup -q + +%build +# Set up the SUSE Linux version macros +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 '/@is_opensuse@%{?is_opensuse:nomatch}/d' \ + -e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \ +%if 0%{?is_opensuse} + -e '/@sle_version@%{?sle_version:nomatch}/d' \ + -e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \ +%else + -e '/@sle_version@/d' \ +%endif + < suse_macros.in > suse_macros + +%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 +trimdate=$(rpm -qa --qf %{BUILDTIME}\\n |sort -n|tail -1) +trimdate=$(( (trimdate / 31557600 - 3) * 31557600 + 6 * 3600 )) +cat < macros.d/macros.opensuse +# trim binary changelogs to include roughly 3 years +# maxnum,cuttime,minnum +%%_binarychangelogtrim 0,$trimdate,10 +EOF +%endif + +%install +# Install SUSE vendor macros and rpmrc +mkdir -p %{buildroot}%{_rpmconfigdir}/suse +cp -a suse_macros %{buildroot}%{_rpmconfigdir}/suse/macros + +# Install vendor dependency generators +cp -a fileattrs %{buildroot}%{_rpmconfigdir} +cp -a scripts/* %{buildroot}%{_rpmconfigdir} +cp -a macros.d %{buildroot}%{_rpmconfigdir} + +%files +%license COPYING +%doc README.md +%{_rpmconfigdir}/suse/ +%{_rpmconfigdir}/macros.d/macros.* +%{_rpmconfigdir}/fileattrs/* +%{_rpmconfigdir}/brp-suse +%{_rpmconfigdir}/firmware.prov +%{_rpmconfigdir}/sysvinitdeps.sh +%{_rpmconfigdir}/locale.prov +# kmod deps +%{_rpmconfigdir}/find-provides.ksyms +%{_rpmconfigdir}/find-requires.ksyms +%{_rpmconfigdir}/find-supplements.ksyms + +%changelog