openscap-1.2.6-1

.gitignore

@@ -48,3 +48,4 @@ openscap-0.6.0.tar.gz
 /openscap-1.2.3.tar.gz
 /openscap-1.2.4.tar.gz
 /openscap-1.2.5.tar.gz
+/openscap-1.2.6.tar.gz

openscap.spec

@@ -1,12 +1,20 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%if 0%{?fedora} <= 22 || (0%{?rhel} != 0 && 0%{?rhel} <= 7)
+%global oscapdocker_pypkg python
+%global oscapdocker_pysitelib %{python_sitelib}
+%else
+%global oscapdocker_pypkg python3
+%global oscapdocker_pysitelib %{python3_sitelib}
+%endif
+
 %define relabel_files() \
 restorecon -R /usr/bin/oscap /usr/libexec/openscap; \
 
 Name:           openscap
-Version:        1.2.5
+Version:        1.2.6
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -97,6 +105,7 @@ Group:          Applications/System
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       rpmdevtools rpm-build
 Requires:       %{name}-scanner%{?_isa} = %{version}-%{release}
+Requires:       %{name}-containers = %{version}-%{release}
 
 %description    utils
 The %{name}-utils package contains command-line tools build on top
@@ -156,6 +165,16 @@ Requires:       pkgconfig
 The %{name}-engine-sce-devel package contains libraries and header files
 for developing applications that use %{name}-engine-sce.
 
+%package        containers
+Summary:        Utils for scanning containers
+Group:          Applications/System
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-scanner atomic
+BuildArch:      noarch
+
+%description    containers
+Tool for scanning Atomic containers.
+
 %prep
 %setup -q
 
@@ -169,7 +188,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie"
 export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 %endif
 
-%configure --enable-sce --enable-perl --enable-python3
+%configure --enable-sce --enable-perl --enable-python3 preferred_python=%{oscapdocker_pypkg}
 
 make %{?_smp_mflags}
 # Remove shebang from bash-completion script
@@ -287,8 +306,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/oscap-scan.cron
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/oscap.8.gz
+%exclude %{_mandir}/man8/oscap-docker.8.gz
 %{_bindir}/*
 %exclude %{_bindir}/oscap
+%exclude %{_bindir}/oscap-docker
 
 %files content-sectool
 %defattr(-,root,root,-)
@@ -305,7 +326,16 @@ rm -rf $RPM_BUILD_ROOT
 %files engine-sce
 %{_libdir}/libopenscap_sce.so.*
 
+%files containers
+%defattr(-,root,root,-)
+%{_bindir}/oscap-docker
+%{_mandir}/man8/oscap-docker.8.gz
+%{oscapdocker_pysitelib}/oscap_docker_python/*
+
 %changelog
+* Mon Oct 05 2015 Zbyněk Moravec <zmoravec@redhat.com> - 1.2.6-1
+- upgrade to the latest upstream release
+
 * Wed Jul 29 2015 Martin Preisler <mpreisle@redhat.com> - 1.2.5-2
 - rebuilt because of librpm and librpmio ABI break
 

sources

@@ -1 +1 @@
-c65f61382837de143f00e508844d5b20  openscap-1.2.5.tar.gz
+9c40ec65fec2649cd98ae5025abfd5f6  openscap-1.2.6.tar.gz