From 1f4c9fbc72dc92c5ea076292afb91a3d02d978d8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 23:32:55 +0000 Subject: import libcomps-0.1.8-14.el7 --- diff --git a/SOURCES/0002-Python_ADDITIONAL_VERSIONS.patch b/SOURCES/0002-Python_ADDITIONAL_VERSIONS.patch new file mode 100644 index 0000000..09b8eb6 --- /dev/null +++ b/SOURCES/0002-Python_ADDITIONAL_VERSIONS.patch @@ -0,0 +1,21 @@ +diff -Naur a/libcomps/src/python/CMakeLists.txt b/libcomps/src/python/CMakeLists.txt +--- a/libcomps/src/python/CMakeLists.txt 2019-03-11 08:09:27.000000000 +0100 ++++ b/libcomps/src/python/CMakeLists.txt 2019-11-13 11:42:40.918533734 +0100 +@@ -1,6 +1,6 @@ +-include(tests/tests.cmake) + #include(pycopy.cmake) + include(pversion.cmake) ++include(tests/tests.cmake) + set(pycopy "py${pversion}-copy") + + set (pycomps_TESTSDIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/") +diff -Naur a/libcomps/src/python/pversion.cmake b/libcomps/src/python/pversion.cmake +--- a/libcomps/src/python/pversion.cmake 2019-03-11 08:09:27.000000000 +0100 ++++ b/libcomps/src/python/pversion.cmake 2019-11-13 09:56:12.127189225 +0100 +@@ -7,5 +7,6 @@ + set(pversion 2) + else() + message("Building for python3") ++ set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7 3.8) + set(pversion 3) + endif() diff --git a/SPECS/libcomps.spec b/SPECS/libcomps.spec index d3a161a..0389abf 100644 --- a/SPECS/libcomps.spec +++ b/SPECS/libcomps.spec @@ -1,18 +1,15 @@ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%bcond_with python3 -%else %bcond_without python3 -%endif Name: libcomps Version: 0.1.8 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Comps XML file manipulation library License: GPLv2+ URL: https://github.com/rpm-software-management/libcomps Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz Patch1: 0001-Fix-UAF-in-comps_objmrtree_unite-function.patch +Patch2: 0002-Python_ADDITIONAL_VERSIONS.patch BuildRequires: cmake BuildRequires: gcc @@ -142,6 +139,9 @@ popd %endif %changelog +* Wed Nov 27 2019 Ales Matej - 0.1.8-14 +- Add Python 3 bindings + * Tue Oct 08 2019 Pavla Kratochvilova - 0.1.8-13 - Fix UAF in comps_objmrtree_unite function (RhBug:1668683)