rpms/oscap-anaconda-addon
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to the 2.0.0 upstream release.

Browse Source 
Resolves: rhbz#1970874
This commit is contained in:
Matej Tyc 2021-07-02 17:23:55 +02:00
parent bf3ebe9ef9
commit 558b68408d
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,3 +5,5 @@
/oscap-anaconda-addon-0.6.tar.gz /oscap-anaconda-addon-0.6.tar.gz
/oscap-anaconda-addon-0.7.tar.gz /oscap-anaconda-addon-0.7.tar.gz
/oscap-anaconda-addon-1.0.tar.gz /oscap-anaconda-addon-1.0.tar.gz
/oscap-anaconda-addon-2.0.0.tar.gz
/addon-dbus-data.zip

15
oscap-anaconda-addon.spec
View File

@ -9,14 +9,16 @@
%endif %endif
Name: oscap-anaconda-addon Name: oscap-anaconda-addon
Version: 1.0 Version: 2.0.0
Release: 11%{?dist} Release: 1%{?dist}
Summary: Anaconda addon integrating OpenSCAP to the installation process Summary: Anaconda addon integrating OpenSCAP to the installation process
License: GPLv2+ License: GPLv2+
URL: https://github.com/OpenSCAP/oscap-anaconda-addon URL: https://github.com/OpenSCAP/oscap-anaconda-addon
Source0: https://github.com/OpenSCAP/oscap-anaconda-addon/releases/download/r%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/OpenSCAP/oscap-anaconda-addon/releases/download/r%{version}/%{name}-%{version}.tar.gz
# TODO: Remove when the fixed upstream release contains dbus service data
Source1: addon-dbus-data.zip
BuildArch: noarch BuildArch: noarch
BuildRequires: make BuildRequires: make
@ -26,7 +28,6 @@ BuildRequires: python3-pycurl
BuildRequires: openscap openscap-utils openscap-python3 BuildRequires: openscap openscap-utils openscap-python3
BuildRequires: anaconda-core >= %{anaconda_core_version} BuildRequires: anaconda-core >= %{anaconda_core_version}
Requires: anaconda-core >= %{anaconda_core_version} Requires: anaconda-core >= %{anaconda_core_version}
Requires: python3-cpio
Requires: python3-pycurl Requires: python3-pycurl
Requires: python3-kickstart Requires: python3-kickstart
Requires: openscap openscap-utils openscap-python3 Requires: openscap openscap-utils openscap-python3
@ -39,7 +40,7 @@ content.
%prep %prep
%autosetup %autosetup
unzip %{_sourcedir}/addon-dbus-data.zip
%build %build
@ -51,10 +52,16 @@ make install DESTDIR=%{buildroot}
%files -f %{name}.lang %files -f %{name}.lang
%{_datadir}/anaconda/addons/org_fedora_oscap %{_datadir}/anaconda/addons/org_fedora_oscap
%{_datadir}/anaconda/dbus/confs/org.fedoraproject.Anaconda.Addons.OSCAP.conf
%{_datadir}/anaconda/dbus/services/org.fedoraproject.Anaconda.Addons.OSCAP.service
%doc COPYING ChangeLog README.md %doc COPYING ChangeLog README.md
%changelog %changelog
* Fri Jul 02 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-1
- Rebase to the 2.0.0 upstream release.
- Remove the cpio dependency which is not needed any more.
* Wed Jun 23 2021 Jan Černý <jcerny@redhat.com> - 1.0-11 * Wed Jun 23 2021 Jan Černý <jcerny@redhat.com> - 1.0-11
- Rebuild after test config change in test.yml - Rebuild after test config change in test.yml

3
sources
View File

@ -1 +1,2 @@
SHA512 (oscap-anaconda-addon-1.0.tar.gz) = fe6de7857eedeb81e400b9e06c5c8ee245906ddde8420ebe498da7ed1a6587075941bcb5f65c6bbf5cef0a6baecc6466ee102eeab76a1ef79db49c28d6a22de7 SHA512 (oscap-anaconda-addon-2.0.0.tar.gz) = 39d8692e8904cfd6e0b2b00e5081805977f4510154315be22732b8b31a42e65ed8a11dc2711f5ad5d4964bb1728521ce472ac208852f6a2373be45903a8d5611
SHA512 (addon-dbus-data.zip) = 2a618f6084f4dd5571d5c2aa22f7c7316e0e2de8a61c8eb13a9127f8726655e3d173d71c74ee7aa305d046a70f030ed07be8405debeb5fd0e8b6a40f081acf71