diff --git a/1.3.1.tar.gz b/1.3.1.tar.gz deleted file mode 100644 index 54f265a..0000000 --- a/1.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c5caa1bc8f10c470cf03bf6818986185f51513b9775f6363260cb6e79038c2f -size 12333871 diff --git a/_service b/_service new file mode 100644 index 0000000..b20374a --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + https://github.com/openscap/openscap.git + git + maint-1.3 + @PARENT_TAG@+git.%cd + + + *.tar + bz2 + + + diff --git a/openscap-1.3.1+git.20200110.tar.bz2 b/openscap-1.3.1+git.20200110.tar.bz2 new file mode 100644 index 0000000..624e169 --- /dev/null +++ b/openscap-1.3.1+git.20200110.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0624c283f9a6da2cce858d1ccdbd52c6b375b158bd244d3ddc424eaafe63f5ae +size 7951975 diff --git a/openscap.changes b/openscap.changes index 16e16db..64d096d 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jan 11 17:24:21 UTC 2020 - Marcus Meissner + +- 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 + +- use distribution-release instead of dummy-release + ------------------------------------------------------------------- Thu Jun 13 14:22:06 UTC 2019 - Robert Frohl diff --git a/openscap.spec b/openscap.spec index c8b52aa..6ba71ba 100644 --- a/openscap.spec +++ b/openscap.spec @@ -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/*