SHA256
1
0
forked from pool/openscap

Accepting request 763678 from security

- temporary openscap 1.3.1 git snapshot
  - make it build with new RPM  (bsc#1160720)

- use distribution-release instead of dummy-release

OBS-URL: https://build.opensuse.org/request/show/763678
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2020-01-12 22:25:36 +00:00 committed by Git OBS Bridge
commit 07bbae3c10
5 changed files with 35 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c5caa1bc8f10c470cf03bf6818986185f51513b9775f6363260cb6e79038c2f
size 12333871

13
_service Normal file
View File

@ -0,0 +1,13 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/openscap/openscap.git</param>
<param name="scm">git</param>
<param name="revision">maint-1.3</param>
<param name="versionformat">@PARENT_TAG@+git.%cd</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service mode="disabled" name="set_version"/>
</services>

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0624c283f9a6da2cce858d1ccdbd52c6b375b158bd244d3ddc424eaafe63f5ae
size 7951975

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Jan 11 17:24:21 UTC 2020 - Marcus Meissner <meissner@suse.com>
- temporary openscap 1.3.1 git snapshot
- make it build with new RPM (bsc#1160720)
-------------------------------------------------------------------
Sat Jan 11 09:01:49 UTC 2020 - Marcus Meissner <meissner@suse.com>
- use distribution-release instead of dummy-release
-------------------------------------------------------------------
Thu Jun 13 14:22:06 UTC 2019 - Robert Frohl <rfrohl@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package openscap
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,9 +25,11 @@
%define with_bindings 0
Name: openscap
Version: 1.3.1
Release: 1.0
Source: https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
Version: 1.3.1+git.20200110
Release: 0
#Source: https://github.com/OpenSCAP/openscap/archive/%{version}.tar.gz
# temp snapshot to make it build with new RPM before 1.3.2
Source: openscap-%version.tar.bz2
Source1: openscap-rpmlintrc
Source2: sysconfig.oscap-scan
# SUSE specific profile, based on yast2-security checks.
@ -45,7 +47,7 @@ BuildRequires: doxygen
%if !0%{?is_opensuse} && 0%{?sle_version} < 130000
BuildRequires: sles-release
%else
BuildRequires: dummy-release
BuildRequires: distribution-release
%endif
BuildRequires: libacl-devel
BuildRequires: libattr-devel
@ -290,6 +292,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml %{buildroot}/%{_datadir}/ope
%{_bindir}/oscap-chroot
%{_bindir}/scap-as-rpm
%{_bindir}/oscap-podman
%{_bindir}/oscap-run-sce-script
%{_sbindir}/rcoscap-scan
%{_datadir}/bash-completion/completions/*