diff --git a/canongnu.diff b/canongnu.diff new file mode 100644 index 0000000..fed586e --- /dev/null +++ b/canongnu.diff @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2023-10-13 12:38:26.953411554 +0000 ++++ CMakeLists.txt 2023-10-13 12:40:11.057239934 +0000 +@@ -144,7 +144,7 @@ function(makemacros) + + set(RPMCANONVENDOR ${host_vendor}) + set(RPMCANONOS ${host_os}) +- set(RPMCANONGNU -gnu) ++ set(RPMCANONGNU -gnu CACHE STRING "gnu os suffix") + + if (ENABLE_CUTF8) + set(C_LOCALE "C.UTF-8") diff --git a/rpm.changes b/rpm.changes index 9e86af5..8ecbd3b 100644 --- a/rpm.changes +++ b/rpm.changes @@ -35,6 +35,7 @@ Wed Oct 11 17:07:14 CEST 2023 - mls@suse.de - new patches: * python_setup.diff * rpmsort_reverse.diff + * canongnu.diff - new file: * build-aux.tar.bz2 (taken from rpm-4.18) - fix --runposttrans not working correctly with the --root diff --git a/rpm.spec b/rpm.spec index 64706e8..ff35fb4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -112,6 +112,7 @@ Patch134: zstdthreaded.diff Patch135: selinux_transactional_update.patch Patch136: rpmsort_reverse.diff Patch137: python_setup.diff +Patch138: canongnu.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -224,7 +225,7 @@ rm -rf sqlite %patch -P 100 -P 102 -P 103 %patch -P 117 %patch -P 122 -P 123 -%patch -P 131 -P 133 -P 134 -P 135 -P 136 -P 137 +%patch -P 131 -P 133 -P 134 -P 135 -P 136 -P 137 -P 138 %ifarch aarch64 ppc64le riscv64 %patch6464