From 9cfba3155b3a18cf303c085ebaeb2ccf778821d2 Mon Sep 17 00:00:00 2001
From: Matej Tyc <matyc@redhat.com>
Date: Mon, 14 Jun 2021 17:11:19 +0200
Subject: [PATCH] Removed dependencies that are not needed.

Resolves: rhbz#1916781
Resolves: rhbz#1922326
---
 oscap-anaconda-addon.spec | 40 ++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/oscap-anaconda-addon.spec b/oscap-anaconda-addon.spec
index c26941d..159eb30 100644
--- a/oscap-anaconda-addon.spec
+++ b/oscap-anaconda-addon.spec
@@ -1,32 +1,36 @@
+%if 0%{?rhel} == 8
+%define anaconda_core_version 33
+%endif
+%if 0%{?rhel} == 9
+%define anaconda_core_version 34
+%endif
+%if 0%{?fedora}
+%define anaconda_core_version %{fedora}
+%endif
+
 Name:           oscap-anaconda-addon
 Version:        1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Anaconda addon integrating OpenSCAP to the installation process
 
 License:        GPLv2+
 URL:            https://github.com/OpenSCAP/oscap-anaconda-addon
 
-# This is a Red Hat maintained package which is specific to
-# our distribution.
-#
-# The source is thus available only from within this SRPM
-# or via direct git checkout:
-# git clone git://git.fedorahosted.org/oscap-anaconda-addon.git
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/OpenSCAP/oscap-anaconda-addon/releases/download/r%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gettext
 BuildRequires:  python3-devel
 BuildRequires:  python3-pycurl
-BuildRequires:  python3-mock
-BuildRequires:  python3-nose
-BuildRequires:  python3-cpio
 BuildRequires:  openscap openscap-utils openscap-python3
-BuildRequires:  anaconda >= 28.22
-Requires:       anaconda >= 28.22
+BuildRequires:  anaconda-core >= %{anaconda_core_version}
+Requires:       anaconda-core >= %{anaconda_core_version}
 Requires:       python3-cpio
+Requires:       python3-pycurl
+Requires:       python3-kickstart
 Requires:       openscap openscap-utils openscap-python3
+Requires:       scap-security-guide
 
 %description
 This is an addon that integrates OpenSCAP utilities with the Anaconda installer
@@ -34,7 +38,7 @@ and allows installation of systems following restrictions given by a SCAP
 content.
 
 %prep
-%setup -q
+%autosetup
 
 
 %build
@@ -51,6 +55,12 @@ make install DESTDIR=%{buildroot}
 %doc COPYING ChangeLog README.md
 
 %changelog
+* Mon Jun 14 2021 Matej Tyc <matyc@redhat.com> - 1.0-10
+- Unified the spec file with the Fedora one.
+- Removed unwanted dependencies.
+- nose is not needed for a long time.
+- mock has been moved into the Python standard library, so it is also not needed.
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-9
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937