From 6e79fd51d8d41edb2372ff1e27566c271c444f26 Mon Sep 17 00:00:00 2001 From: "chenyuao.cya" Date: Mon, 28 Nov 2022 17:47:40 +0800 Subject: [PATCH 1/2] add require sequoia for V3 signature support and drop the temporary build-dependency pandoc --- rpm.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/rpm.spec b/rpm.spec index 955fa06..74b1e3c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,6 @@ -%define anolis_release 2 +%define anolis_release 3 +%define rpmhome /usr/lib/rpm + # run internal testsuite? # fakechroot is severely broken, disable it %bcond_with check @@ -21,8 +23,8 @@ %bcond_without sqlite # build with bdb_ro support? %bcond_without bdb_ro - -%define rpmhome /usr/lib/rpm +# build with sequoia support? +%bcond_without sequoia %global rpmver 4.18.0 %global sover 9 @@ -53,6 +55,11 @@ Requires: popt >= 1.10.2.1 Requires: curl Obsoletes: python2-rpm < %{version}-%{release} +%if %{with sequoia} +# >= 1.2.0 required for v3 signature support +Requires: rpm-sequoia%{_isa} >= 1.2.0 +%endif + %if %{with check} BuildRequires: fakechroot gnupg2 BuildRequires: debugedit >= 0.3 @@ -92,9 +99,6 @@ BuildRequires: sqlite-devel # Couple of patches change makefiles so, require for now... BuildRequires: automake libtool -# Temporary! Work around bugs in beta1 makefiles -BuildRequires: pandoc - %if %{with plugins} BuildRequires: libselinux-devel BuildRequires: dbus-devel @@ -614,6 +618,9 @@ fi %doc docs/librpm/html/* %changelog +* Mon Nov 28 2022 chen_yu_ao - 4.18.0-3 +- add require sequoia for V3 signature support and drop the temporary build-dependency pandoc + * Thu Oct 13 2022 mgb01105731 - 4.18.0-2 - optimise spec file -- Gitee From 1042c318f02dbeee36a274c3b47aeaf5cdb95bf5 Mon Sep 17 00:00:00 2001 From: "chenyuao.cya" Date: Mon, 28 Nov 2022 20:43:29 +0800 Subject: [PATCH 2/2] remove some abidir files --- rpm.spec | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/rpm.spec b/rpm.spec index 74b1e3c..19c069a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -23,8 +23,6 @@ %bcond_without sqlite # build with bdb_ro support? %bcond_without bdb_ro -# build with sequoia support? -%bcond_without sequoia %global rpmver 4.18.0 %global sover 9 @@ -55,11 +53,6 @@ Requires: popt >= 1.10.2.1 Requires: curl Obsoletes: python2-rpm < %{version}-%{release} -%if %{with sequoia} -# >= 1.2.0 required for v3 signature support -Requires: rpm-sequoia%{_isa} >= 1.2.0 -%endif - %if %{with check} BuildRequires: fakechroot gnupg2 BuildRequires: debugedit >= 0.3 @@ -568,10 +561,6 @@ fi %{_bindir}/gendiff %{_bindir}/rpmspec %{_bindir}/rpmlua -%{abidir}/rpmbuild-option.list -%{abidir}/gendiff-option.list -%{abidir}/rpmspec-option.list -%{abidir}/rpmlua-option.list %{_mandir}/man1/gendiff.1* %{_mandir}/man8/rpmbuild.8* @@ -619,7 +608,7 @@ fi %changelog * Mon Nov 28 2022 chen_yu_ao - 4.18.0-3 -- add require sequoia for V3 signature support and drop the temporary build-dependency pandoc +- drop the temporary build-dependency pandoc and optimise spec format * Thu Oct 13 2022 mgb01105731 - 4.18.0-2 - optimise spec file -- Gitee