Update to 0.1.17

This commit is contained in:
Pavla Kratochvilova 2021-06-15 08:05:58 +02:00
parent ce475355a5
commit d6d282576f
2 changed files with 15 additions and 88 deletions

View File

@ -1,27 +1,13 @@
%define __cmake_in_source_build 1
# Do not build python3 bindings for RHEL <= 7
%if 0%{?rhel} && 0%{?rhel} <= 7
%bcond_with python3
%else
%bcond_without python3
%endif
# Do not build python2 bindings for RHEL > 7 and Fedora > 29
%if 0%{?rhel} > 7 || 0%{?fedora} > 29
%bcond_with python2
%else
%bcond_without python2
%endif
Name: libcomps
Version: 0.1.15
Release: 7%{?dist}
Version: 0.1.17
Release: 1%{?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
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: cmake
@ -55,32 +41,12 @@ Documentation files for libcomps library.
Summary: Documentation files for python bindings libcomps library
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%if %{with python3}
BuildRequires: python3-sphinx
%endif
%if %{with python2}
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: python-sphinx
%else
BuildRequires: python2-sphinx
%endif
%endif
%description -n python-%{name}-doc
Documentation files for python bindings libcomps library.
%if %{with python2}
%package -n python2-%{name}
Summary: Python 2 bindings for libcomps library
%{?python_provide:%python_provide python2-%{name}}
BuildRequires: python2-devel
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python2-%{name}
Python 2 bindings for libcomps library.
%endif
%if %{with python3}
%package -n python3-%{name}
Summary: Python 3 bindings for libcomps library
BuildRequires: python3-devel
@ -91,73 +57,35 @@ Obsoletes: platform-python-%{name} < %{version}-%{release}
%description -n python3-%{name}
Python3 bindings for libcomps library.
%endif
%prep
%autosetup -p1 -n %{name}-%{name}-%{version}
%autosetup -p1 -n %{name}-%{version}
%if %{with python2}
mkdir build-py2
%endif
%if %{with python3}
mkdir build-py3
%endif
mkdir build-doc
%build
%if %{with python2}
pushd build-py2
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=2
%make_build
popd
%endif
%if %{with python3}
pushd build-py3
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=3
%cmake ../libcomps/
%make_build
popd
%endif
pushd build-doc
%if %{with python2}
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=2
%else
%if %{with python3}
%cmake ../libcomps/ -DPYTHON_DESIRED:STRING=3
%endif
%endif
%cmake ../libcomps/
make %{?_smp_mflags} docs
make %{?_smp_mflags} pydocs
popd
%install
%if %{with python2}
pushd build-py2
%make_install
popd
%endif
%if %{with python3}
pushd build-py3
%make_install
popd
%endif
%check
%if %{with python2}
pushd build-py2
make test
make pytest
popd
%endif
%if %{with python3}
pushd build-py3
make test
make pytest
popd
%endif
%if %{undefined ldconfig_scriptlets}
%post -p /sbin/ldconfig
@ -182,19 +110,18 @@ popd
%files -n python-%{name}-doc
%doc build-doc/src/python/docs/html
%if %{with python2}
%files -n python2-%{name}
%{python2_sitearch}/%{name}/
%{python2_sitearch}/%{name}-%{version}-py%{python2_version}.egg-info
%endif
%if %{with python3}
%files -n python3-%{name}
%{python3_sitearch}/%{name}/
%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
%endif
%changelog
* Tue Jun 15 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.1.17-1
- Update to 0.1.17
- Fix a crash when clearing COMPS_ObjRTree (RhBug:1888343)
- Don't print empty requires
- Fix memory leaks and resource leaks
- Remove Python 2 support
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 0.1.15-7
- Rebuilt for Python 3.10

View File

@ -1 +1 @@
SHA512 (libcomps-0.1.15.tar.gz) = e546853c70bf463345803db28cb47a19671f58e45641624b9b4a25486347e7d9d57fcf6b2e7d8dc77e510aa009c7fc2d0c300d19b2eb3fe9b4b01e12e3e70404
SHA512 (libcomps-0.1.17.tar.gz) = febad0227ee2b2e061bfe5aa4fd8113760aca5e426b3814cc2f6ea52e3633a256486b1b4e36c8d755ab7fb5e7afbdde1b423be5e7343d6afe286d0865352bd80