diff --git a/0.7.20.tar.gz b/0.7.20.tar.gz new file mode 100644 index 0000000..050991f Binary files /dev/null and b/0.7.20.tar.gz differ diff --git a/libsolv-0.7.17.tar.gz b/libsolv-0.7.17.tar.gz deleted file mode 100644 index 2d7ae0d..0000000 Binary files a/libsolv-0.7.17.tar.gz and /dev/null differ diff --git a/libsolv.spec b/libsolv.spec index 7898163..7aecdef 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -11,20 +11,24 @@ %bcond_without multi_semantics %bcond_with zchunk %bcond_without zstd +%bcond_without conda Name: libsolv -Version: 0.7.17 +Version: 0.7.20 Release: 1 Summary: Package dependency solver License: BSD URL: https://github.com/openSUSE/libsolv -Source: https://github.com/openSUSE/libsolv/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/openSUSE/libsolv/archive/refs/tags/%{version}.tar.gz + BuildRequires: cmake gcc-c++ ninja-build pkgconfig(rpm) zlib-devel -BuildRequires: libxml2-devel xz-devel bzip2-devel libzstd-devel -Requires: %{_bindir}/find %{_bindir}/curl %{_bindir}/gpg2 -Provides: libsolv-tools libsolv-demo -Obsoletes: libsolv-tools < %{version}-%{release} -Obsoletes: libsolv-demo < %{version}-%{release} +BuildRequires: libxml2-devel xz-devel bzip2-devel +%if %{with zstd} +BuildRequires: libzstd-devel +%endif +%if %{with zchunk} +BuildRequires: pkgconfig(zck) +%endif Requires: rpm @@ -45,6 +49,23 @@ Requires: %{name} = %{version}-%{release} rpm-devel %description devel Development files for %{name}. +%package tools +Summary: Package dependency solver tools +Requires: %{name} = %{version}-%{release} +Requires: %{_bindir}/find + +%description tools +Package dependency solver tools. + +%package demo +Summary: Applications demoing the %{name} library +Requires: %{name} = %{version}-%{release} +Requires: /usr/bin/curl +Requires: /usr/bin/gpg2 + +%description demo +Applications demoing the %{name} library. + %package -n perl-solv Summary: Perl bindings for the %{name} library BuildRequires: swig perl-devel perl-generators @@ -101,6 +122,7 @@ Python 3 version. %{?with_arch_repo:-DENABLE_ARCHREPO=ON} \ %{?with_multi_semantics:-DMULTI_SEMANTICS=ON} \ %{?with_complex_deps:-DENABLE_COMPLEX_DEPS=1} \ + %{?with_conda:-DENABLE_CONDA=ON} \ %{?with_perl_bindings:-DENABLE_PERL=ON} \ %{?with_ruby_bindings:-DENABLE_RUBY=ON} \ %if %{with python3_bindings} @@ -127,10 +149,6 @@ Python 3 version. %license LICENSE* %{_libdir}/%{name}.so.* %{_libdir}/%{name}ext.so.* -%{_bindir}/{solv,dumpsolv,installcheck,mergesolv,rpmdb2solv} -%{_bindir}/{rpms2solv,testsolv,repo2solv,comps2solv,appdata2solv,deb2solv} -%{_bindir}/{archpkgs2solv,archrepo2solv,helix2solv,repomdxml2solv} -%{_bindir}/{deltainfoxml2solv,updateinfoxml2solv,rpmmd2solv,susetags2solv} %files devel %{_libdir}/%{name}.so @@ -141,6 +159,44 @@ Python 3 version. %dir %{_datadir}/cmake/Modules/ %{_datadir}/cmake/Modules/FindLibSolv.cmake +%files tools +%{_bindir}/deltainfoxml2solv +%{_bindir}/dumpsolv +%{_bindir}/installcheck +%{_bindir}/mergesolv +%{_bindir}/repomdxml2solv +%{_bindir}/rpmdb2solv +%{_bindir}/rpmmd2solv +%{_bindir}/rpms2solv +%{_bindir}/testsolv +%{_bindir}/updateinfoxml2solv +%{_bindir}/repo2solv +%if %{with comps} + %{_bindir}/comps2solv +%endif +%if %{with appdata} + %{_bindir}/appdata2solv +%endif +%if %{with debian_repo} + %{_bindir}/deb2solv +%endif +%if %{with arch_repo} + %{_bindir}/archpkgs2solv + %{_bindir}/archrepo2solv +%endif +%if %{with helix_repo} + %{_bindir}/helix2solv +%endif +%if %{with suse_repo} + %{_bindir}/susetags2solv +%endif +%if %{with conda} + %{_bindir}/conda2solv +%endif + +%files demo +%{_bindir}/solv + %files -n perl-solv %{perl_vendorarch}/solv.pm %{perl_vendorarch}/solv.so @@ -149,9 +205,7 @@ Python 3 version. %{ruby_vendorarchdir}/solv.so %files -n python3-solv -%{python3_sitearch}/_solv.so -%{python3_sitearch}/solv.py -%{python3_sitearch}/__pycache__/solv.* +%{python3_sitearch}/* %files help %doc README @@ -159,6 +213,9 @@ Python 3 version. %{_mandir}/man3/%{name}*.3* %changelog +* Sat Dec 25 2021 wangkerong - 0.7.20-1 +- update to 0.7.20 + * Sat Jan 30 2021 xihaochen - 0.7.17-1 - Type:requirements - Id:NA