import libsolv-0.7.17-2.el8
This commit is contained in:
CentOS Sources
parent
332b697ab9
commit
9fd4b0690f
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/libsolv-0.7.16.tar.gz
|
||||
SOURCES/libsolv-0.7.17.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
6adefba167c60bbb282bed453bd1b9966311f91d SOURCES/libsolv-0.7.16.tar.gz
|
||||
ef94c30e9348a56caa140dd80b6b21bc997a5f0c SOURCES/libsolv-0.7.17.tar.gz
|
||||
|
||||
@ -1,19 +1,8 @@
|
||||
%global libname solv
|
||||
|
||||
%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 29)
|
||||
%bcond_without python2_bindings
|
||||
%else
|
||||
%bcond_with python2_bindings
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%bcond_with perl_bindings
|
||||
%bcond_with ruby_bindings
|
||||
%bcond_with python3_bindings
|
||||
%else
|
||||
%bcond_without python_bindings
|
||||
%bcond_without perl_bindings
|
||||
%bcond_without ruby_bindings
|
||||
%bcond_without python3_bindings
|
||||
%endif
|
||||
# Creates special prefixed pseudo-packages from appdata metadata
|
||||
%bcond_without appdata
|
||||
# Creates special prefixed "group:", "category:" pseudo-packages
|
||||
@ -27,6 +16,7 @@
|
||||
%bcond_with arch_repo
|
||||
# For handling deb + rpm at the same time
|
||||
%bcond_with multi_semantics
|
||||
%bcond_with zchunk
|
||||
%else
|
||||
%bcond_without helix_repo
|
||||
%bcond_without suse_repo
|
||||
@ -34,15 +24,18 @@
|
||||
%bcond_without arch_repo
|
||||
# For handling deb + rpm at the same time
|
||||
%bcond_without multi_semantics
|
||||
%bcond_without zstd
|
||||
%bcond_without zchunk
|
||||
%endif
|
||||
%bcond_without zstd
|
||||
|
||||
#global commitnum 2901
|
||||
#global commit 47fbaa2a0892866d30ec0e1b4c885532d0aca7b8
|
||||
#global shortcommit %%(c=%%{commit}; echo ${c:0:7})
|
||||
|
||||
%define __cmake_switch(b:) %{expand:%%{?with_%{-b*}:ON}}%{expand:%%{!?with_%{-b*}:OFF}}
|
||||
|
||||
Name: lib%{libname}
|
||||
Version: 0.7.16
|
||||
Version: 0.7.17
|
||||
Release: 2%{?commit:.git.%{commitnum}.%{?shortcommit}}%{?dist}
|
||||
Summary: Package dependency solver
|
||||
|
||||
@ -69,8 +62,16 @@ BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: xz-devel
|
||||
# -DENABLE_BZIP2_COMPRESSION=ON
|
||||
BuildRequires: bzip2-devel
|
||||
%if %{with zstd}
|
||||
# -DENABLE_ZSTD_COMPRESSION=ON
|
||||
BuildRequires: libzstd-devel
|
||||
%endif
|
||||
%if %{with zchunk}
|
||||
# -DENABLE_ZCHUNK_COMPRESSION=ON
|
||||
BuildRequires: pkgconfig(zck)
|
||||
%endif
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1830346
|
||||
Conflicts: rpm%{?_isa} < 4.14.3
|
||||
|
||||
%description
|
||||
A free package dependency solver using a satisfiability algorithm. The
|
||||
@ -93,12 +94,7 @@ Development files for %{name}.
|
||||
%package tools
|
||||
Summary: Package dependency solver tools
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# repo2solv dependencies. All of those are used in shell-script.
|
||||
Requires: %{_bindir}/gzip
|
||||
Requires: %{_bindir}/bzip2
|
||||
Requires: %{_bindir}/lzma
|
||||
Requires: %{_bindir}/xz
|
||||
Requires: %{_bindir}/cat
|
||||
# repo2solv dependencies. Used as execl()
|
||||
Requires: %{_bindir}/find
|
||||
|
||||
%description tools
|
||||
@ -137,21 +133,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Ruby bindings for the %{name} library.
|
||||
%endif
|
||||
|
||||
%if %{with python2_bindings}
|
||||
%package -n python2-%{libname}
|
||||
Summary: Python bindings for the %{name} library
|
||||
%{?python_provide:%python_provide python2-%{libname}}
|
||||
BuildRequires: swig
|
||||
BuildRequires: python2-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{libname}
|
||||
Python bindings for the %{name} library.
|
||||
|
||||
Python 2 version.
|
||||
%endif
|
||||
|
||||
%if %{with python3_bindings}
|
||||
%if %{with python_bindings}
|
||||
%package -n python3-%{libname}
|
||||
Summary: Python bindings for the %{name} library
|
||||
%{?python_provide:%python_provide python3-%{libname}}
|
||||
@ -169,53 +151,50 @@ Python 3 version.
|
||||
%autosetup -p1 %{?commit:-n %{name}-%{commit}}
|
||||
|
||||
%build
|
||||
%cmake . -B"%{_vpath_builddir}" -GNinja \
|
||||
-DFEDORA=1 \
|
||||
-DENABLE_RPMDB=ON \
|
||||
-DENABLE_RPMDB_BYRPMHEADER=ON \
|
||||
-DENABLE_RPMDB_LIBRPM=ON \
|
||||
-DENABLE_RPMPKG_LIBRPM=ON \
|
||||
-DENABLE_RPMMD=ON \
|
||||
%{?with_comps:-DENABLE_COMPS=ON} \
|
||||
%{?with_appdata:-DENABLE_APPDATA=ON} \
|
||||
-DUSE_VENDORDIRS=ON \
|
||||
-DWITH_LIBXML2=ON \
|
||||
-DWITH_OPENSSL=ON \
|
||||
-DENABLE_LZMA_COMPRESSION=ON \
|
||||
-DENABLE_BZIP2_COMPRESSION=ON \
|
||||
-DENABLE_ZSTD_COMPRESSION=ON \
|
||||
%{?with_helix_repo:-DENABLE_HELIXREPO=ON} \
|
||||
%{?with_suse_repo:-DENABLE_SUSEREPO=ON} \
|
||||
%{?with_debian_repo:-DENABLE_DEBIAN=ON} \
|
||||
%{?with_arch_repo:-DENABLE_ARCHREPO=ON} \
|
||||
%{?with_multi_semantics:-DMULTI_SEMANTICS=ON} \
|
||||
%{?with_complex_deps:-DENABLE_COMPLEX_DEPS=1} \
|
||||
%{?with_perl_bindings:-DENABLE_PERL=ON} \
|
||||
%{?with_ruby_bindings:-DENABLE_RUBY=ON} \
|
||||
%if %{with python2_bindings} || %{with python3_bindings}
|
||||
-DENABLE_PYTHON=ON \
|
||||
%if %{with python2_bindings}
|
||||
-DPythonLibs_FIND_VERSION=%{python2_version} \
|
||||
-DPythonLibs_FIND_VERSION_MAJOR=2 \
|
||||
%if %{with python3_bindings}
|
||||
-DENABLE_PYTHON3=ON \
|
||||
-DPYTHON3_EXECUTABLE=%{__python3} \
|
||||
%endif
|
||||
%else
|
||||
-DPythonLibs_FIND_VERSION=%{python3_version} \
|
||||
-DPythonLibs_FIND_VERSION_MAJOR=3 \
|
||||
%cmake -GNinja \
|
||||
-DFEDORA=1 \
|
||||
-DENABLE_RPMDB=ON \
|
||||
-DENABLE_RPMDB_BYRPMHEADER=ON \
|
||||
-DENABLE_RPMDB_LIBRPM=ON \
|
||||
-DENABLE_RPMPKG_LIBRPM=ON \
|
||||
-DENABLE_RPMMD=ON \
|
||||
-DENABLE_COMPS=%{__cmake_switch -b comps} \
|
||||
-DENABLE_APPDATA=%{__cmake_switch -b appdata} \
|
||||
-DUSE_VENDORDIRS=ON \
|
||||
-DWITH_LIBXML2=ON \
|
||||
-DWITH_OPENSSL=ON \
|
||||
-DENABLE_LZMA_COMPRESSION=ON \
|
||||
-DENABLE_BZIP2_COMPRESSION=ON \
|
||||
-DENABLE_ZSTD_COMPRESSION=%{__cmake_switch -b zstd} \
|
||||
-DENABLE_ZCHUNK_COMPRESSION=%{__cmake_switch -b zchunk} \
|
||||
%if %{with zchunk}
|
||||
-DWITH_SYSTEM_ZCHUNK=ON \
|
||||
%endif
|
||||
-DENABLE_HELIXREPO=%{__cmake_switch -b helix_repo} \
|
||||
-DENABLE_SUSEREPO=%{__cmake_switch -b suse_repo} \
|
||||
-DENABLE_DEBIAN=%{__cmake_switch -b debian_repo} \
|
||||
-DENABLE_ARCHREPO=%{__cmake_switch -b arch_repo} \
|
||||
-DMULTI_SEMANTICS=%{__cmake_switch -b multi_semantics} \
|
||||
-DENABLE_COMPLEX_DEPS=%{__cmake_switch -b complex_deps} \
|
||||
-DENABLE_PERL=%{__cmake_switch -b perl_bindings} \
|
||||
-DENABLE_RUBY=%{__cmake_switch -b ruby_bindings} \
|
||||
-DENABLE_PYTHON=%{__cmake_switch -b python_bindings} \
|
||||
%if %{with python_bindings}
|
||||
-DPYTHON_EXECUTABLE=%{python3} \
|
||||
%endif
|
||||
%{nil}
|
||||
%ninja_build -C "%{_vpath_builddir}"
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%ninja_install -C "%{_vpath_builddir}"
|
||||
%cmake_install
|
||||
|
||||
%check
|
||||
%ninja_test -C "%{_vpath_builddir}"
|
||||
%ctest
|
||||
|
||||
%ldconfig_scriptlets
|
||||
# Python smoke test (not tested in %%ctest):
|
||||
export PYTHONPATH=%{buildroot}%{python3_sitearch}
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
|
||||
%{python3} -c 'import solv'
|
||||
|
||||
%files
|
||||
%license LICENSE*
|
||||
@ -285,13 +264,7 @@ Python 3 version.
|
||||
%{ruby_vendorarchdir}/%{libname}.so
|
||||
%endif
|
||||
|
||||
%if %{with python2_bindings}
|
||||
%files -n python2-%{libname}
|
||||
%{python2_sitearch}/_%{libname}.so
|
||||
%{python2_sitearch}/%{libname}.py*
|
||||
%endif
|
||||
|
||||
%if %{with python3_bindings}
|
||||
%if %{with python_bindings}
|
||||
%files -n python3-%{libname}
|
||||
%{python3_sitearch}/_%{libname}.so
|
||||
%{python3_sitearch}/%{libname}.py
|
||||
@ -299,6 +272,22 @@ Python 3 version.
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Apr 30 2021 Pavla Kratochvilova <pkratoch@redhat.org> - 0.7.17-2
|
||||
- Fix rpm dependency
|
||||
|
||||
* Thu Apr 29 2021 Pavla Kratochvilova <pkratoch@redhat.org> - 0.7.17-1
|
||||
- Update to 0.7.17
|
||||
- selected bug fixes:
|
||||
* repo_write: fix handling of nested flexarray
|
||||
* improve choicerule generation a bit more to cover more cases
|
||||
* harden testcase parser against repos being added too late
|
||||
* support python-3.10
|
||||
* check %_dbpath macro in rpmdb code
|
||||
- new features:
|
||||
* handle default/visible/langonly attributes in comps parser
|
||||
* support multiple collections in updateinfo parser
|
||||
* add '-D' option in rpmdb2solv to set the dbpath
|
||||
|
||||
* Thu Jan 14 2021 Nicola Sella <nsella@redhat.com> - 0.7.16-2
|
||||
- Enable zstd compression in libsolv
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user