From ba66739d57aa9c29c0f60ffa4740165409352dd5 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Feb 25 2021 16:13:33 +0000 Subject: [fix] Remove duplicate elf_end() call in init_elf_data() (#303) [doc] Update translation template Signed-off-by: David Cantrell --- diff --git a/.gitignore b/.gitignore index 2d3b0ad..dc31128 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /rpminspect-1.1.tar.xz /rpminspect-1.2.tar.xz /rpminspect-1.2.tar.xz.asc +/rpminspect-1.3.tar.xz diff --git a/changelog b/changelog index 85c47ab..895445d 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +* Thu Feb 25 2021 David Cantrell - 1.3-1 +- [fix] Remove duplicate elf_end() call in init_elf_data() (#303) +- [doc] Update translation template + +* Wed Jan 27 2021 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Mon Oct 26 2020 David Cantrell - 1.2-1 - For BUILDTYPE=release, generate the correct type of changelog - Minor logic error in submit-koji-builds.sh @@ -812,3 +818,4 @@ - TODO updates - Update rpminspect.pot and POTFILES for translations + diff --git a/rpminspect.spec b/rpminspect.spec index f992521..f54e29a 100644 --- a/rpminspect.spec +++ b/rpminspect.spec @@ -1,6 +1,6 @@ Name: rpminspect -Version: 1.2 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Build deviation compliance tool Group: Development/Tools # librpminspect is licensed under the LGPLv3+, but 5 source files in @@ -10,7 +10,7 @@ Group: Development/Tools # license. License: GPLv3+ and LGPLv2+ and ASL 2.0 and CC-BY URL: https://github.com/rpminspect/rpminspect -Source0: https://github.com/rpminspect/rpminspect/releases/download/v1.2/rpminspect-1.2.tar.xz +Source0: https://github.com/rpminspect/rpminspect/releases/download/v1.3/rpminspect-1.3.tar.xz Source1: changelog Requires: librpminspect%{?_isa} = %{version}-%{release} @@ -63,20 +63,20 @@ Requires: clamav-data # If these are present, the xml inspection can try DTD validation. %if 0%{?rhel} >= 8 || 0%{?fedora} -Suggests: xhtml1-dtds -Suggests: html401-dtds +Recommends: xhtml1-dtds +Recommends: html401-dtds %endif # These programs are only required for the 'shellsyntax' functionality. # You can use rpminspect without these installed, just disable the # shellsyntax inspection. %if 0%{?rhel} >= 8 || 0%{?epel} >= 8 || 0%{?fedora} -Suggests: dash -Suggests: ksh -Suggests: zsh -Suggests: tcsh -Suggests: rc -Suggests: bash +Recommends: dash +Recommends: ksh +Recommends: zsh +Recommends: tcsh +Recommends: rc +Recommends: bash %else Requires: dash Requires: ksh @@ -89,25 +89,25 @@ Requires: bash # The annocheck program is used by the annocheck inspection. If it is # not present, you can disable the annocheck inspection. %if 0%{?rhel} >= 8 || 0%{?epel} >= 8 || 0%{?fedora} -Suggests: /usr/bin/annocheck +Recommends: annobin-annocheck %else -Requires: /usr/bin/annocheck +Requires: annobin-annocheck %endif # The abidiff program is used by the abidiff inspection. If it is not # present, you can disable the abidiff inspection. %if 0%{?rhel} >= 8 || 0%{?epel} >= 8 || 0%{?fedora} -Suggests: /usr/bin/abidiff +Recommends: libabigail >= 1.8 %else -Requires: /usr/bin/abidiff +Requires: libabigail >= 1.8 %endif # The kmidiff program is used by the kmidiff inspection. If it is not # present, you can disable the kmidiff inspection. %if 0%{?rhel} >= 8 || 0%{?epel} >= 8 || 0%{?fedora} -Suggests: /usr/bin/kmidiff +Recommends: libabigail >= 1.8 %else -Requires: /usr/bin/kmidiff +Requires: libabigail >= 1.8 %endif %description -n librpminspect @@ -138,7 +138,7 @@ control files. %prep -%setup -q -n rpminspect-1.2 +%setup -q -n rpminspect-1.3 %build @@ -174,7 +174,4 @@ control files. %changelog -* Wed Jan 27 2021 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - %include %{SOURCE1} diff --git a/sources b/sources index cc226d8..83b488a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpminspect-1.2.tar.xz) = aa3212134e67522d7695eb401bafe0bf54593de1e5c8f541fa91983005ad52e982297aacd0db8d6350b61e67f06eb7535c90703dfb2bb588fa1680f7408e3be3 +SHA512 (rpminspect-1.3.tar.xz) = 17643d57492299efe1c2be3567b5b1de48d46b2262fcbebf3b52de36a7289f4caa9da9747543411eac8afe4b269345c5d74e2fe1bf1d9c04094ad89fc4974b3a