From ec0b2c8cfca3a4e6383711227ac9d467ea5d9c9b Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 19 Oct 2020 12:48:21 +0300 Subject: [PATCH] Add %x86_64 macro In rosa2019.1 we inherited znver1 architecture from OpenMandriva, which is x86_64+optimizations, we do not use it now, but let's add macro for compatibility with constructions like "%ifarch %{x86_64}" --- .abf.yml | 2 +- rpm.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index 60c6ead..274a88b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: RPMBDB-0.1.tar.xz: d56f37fff7f7f8b036b4ce3b06c1ab205687596b cpu-os-macros.tar.gz: 99c5fa561dd0d897bfa8cd97f2aa60781bc578d4 - rpm5-d3fac2102b74234071c7171ec46fc16946646360.tar.gz: 0d322e81a908224ae7c44a4ab21be64b20af4ecf + rpm5-e38555e09747f92be5d09eade4802605561d9585.tar.gz: a5ddbe2a944ecd1dec7bca07d3077cc731bbabfb diff --git a/rpm.spec b/rpm.spec index fdb9395..f662c90 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,4 @@ -%define commit d3fac2102b74234071c7171ec46fc16946646360 +%define commit e38555e09747f92be5d09eade4802605561d9585 %define short_commit %(echo %{commit} | head -c 4) # When updating, change commit hash above to the commit in # https://abf.io/soft/rpm5 that you want to build from @@ -65,7 +65,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: 114.git%{short_commit} +Release: 115.git%{short_commit} License: LGPLv2.1+ Group: System/Configuration/Packaging Url: http://rpm5.org/