Notification time stamped 2021-03-01 05:55:02 UTC
From dd90f9b1ae97980a5dcc5911a419b29d622ed273 Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mar 01 2021 05:48:24 +0000
Subject: Revert "1900816 - we cannot test the dnf plugin due to fakechroot failing
because of glibc changes."
This semantically reverts commit 945ec0fdcc7353bc678e24328c7e38c05f4de21b.
There is fixed fakechroot package available now.
---
diff --git a/avoid-failing-fakechroot.patch b/avoid-failing-fakechroot.patch
deleted file mode 100644
index 8207e18..0000000
--- a/avoid-failing-fakechroot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test.sh b/test.sh
-index ed5845e..3ae4b8d 100755
---- a/test.sh
-+++ b/test.sh
-@@ -495,6 +495,8 @@ for f in tests/swid_generator/*.swidtag ; do
- diff -u ${f/.swidtag/.files} <( SWIDQ_STYLESHEET_DIR=$SWIDQ_STYLESHEET_DIR1
$BIN/swidq -p $f -l )
- done
-
-+echo OK.
-+exit
-
- # Test dnf plugin
- mkdir -p tmp/repo tmp/repo-base
diff --git a/swid-tools.spec b/swid-tools.spec
index 9c710a5..aaeb7a0 100644
--- a/swid-tools.spec
+++ b/swid-tools.spec
@@ -4,11 +4,10 @@
Summary: Tools for producing SWID tags for rpm packages and inspecting the SWID tags
Name: swid-tools
Version: 0.8.11
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
URL:
https://github.com/swidtags/rpm2swidtag
Source0:
https://github.com/swidtags/%{upstream_name}/releases/download/%{upstream...
-Patch1: avoid-failing-fakechroot.patch
BuildArch: noarch
BuildRequires: python3-devel
# The following BuildRequires are only needed for check
@@ -48,7 +47,6 @@ or producing them locally.
%prep
%setup -q -n %{upstream_name}-%{version}
-%patch1 -p1
%build
%py3_build
@@ -99,6 +97,9 @@ if rpm -q rpm2swidtag dnf-plugin-swidtags 2> /dev/null | grep -E -q
'(rpm2swidta
fi
%changelog
+* Mon Mar 01 2021 Jan Pazdziora <jpazdziora(a)redhat.com> - 0.8.11-4
+- Revert the 1900816 workaround.
+
* Sat Jan 30 2021 Jan Pazdziora <jpazdziora(a)redhat.com> - 0.8.11-3
- 1900816 - we cannot test the dnf plugin due to fakechroot failing
because of glibc changes.
https://src.fedoraproject.org/rpms/swid-tools/c/dd90f9b1ae97980a5dcc5911a...