diff --git a/.gitignore b/.gitignore index c9c5c11..60c0125 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,7 @@ /850794025c60bf3efe8bd9e402a19cfe83b2fd7b.tar.gz /99edb54e18f4971f50a359803633f44fdeb08428.tar.gz /2db517f87a8c0364d28c0fa2590ba034e866a4b8.tar.gz +/libsolv-1f9abfb.tar.gz +/libsolv-0.6.12.tar.gz /libsolv-0.6.14.tar.gz +/libsolv-0.6.15.tar.gz diff --git a/libsolv.spec b/libsolv.spec index 4304d65..f7a0da9 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,6 +1,6 @@ %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir'].nil? ? RbConfig::CONFIG['sitearchdir'] : RbConfig::CONFIG['vendorarchdir']")} %filter_provides_in %{perl_vendorarch}/.*\.so$ -%filter_provides_in %{hon2_sitearch}/.*\.so$ +%filter_provides_in %{python2_sitearch}/.*\.so$ %if 0%{?fedora} %bcond_without python3 %filter_provides_in %{python3_sitearch}/.*\.so$ @@ -29,26 +29,13 @@ %filter_setup Name: libsolv -Version: 0.6.14 -Release: 3%{?dist} +Version: 0.6.15 +Release: 1%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv Source: https://github.com/openSUSE/libsolv/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: 0001-ruby-make-compatible-with-ruby-2.2.patch -Patch1: 0001-Move-allowuninstall-map-creation.patch -Patch2: 0002-Prefer-to-autouninstall-orphans.patch -Patch3: 0003-Check-keep_orphans-flag-in-solver_addduprules.patch -Patch4: 0004-Fix-spelling-duh.patch -Patch5: 0001-Simplify-solver_addduprules-a-bit.patch -Patch6: 0002-Drop-inline-from-solver_addtodupmaps.patch -Patch7: 0003-Rename-hasdupjobs-to-needduprules.patch -Patch8: 0004-Fix-typo-in-comment.patch -Patch9: 0005-Speed-up-choice-rule-generation.patch -Patch10: 0006-Make-keep_orphans-also-keep-multiversion-orphans-ins.patch - -BuildRequires: git-core - Group: Development/Libraries Summary: Package dependency solver BuildRequires: cmake libdb-devel expat-devel rpm-devel zlib-devel @@ -109,14 +96,14 @@ Ruby bindings for sat solver. %endif %if 0%{?fedora} -%package -n python-solv +%package -n python2-solv Summary: Python bindings for the libsolv library Group: Development/Languages Requires: python2 Requires: libsolv%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python-solv} +%{?python_provide:%python_provide python2-solv} -%description -n python-solv +%description -n python2-solv Python bindings for sat solver. %endif @@ -144,7 +131,7 @@ Perl bindings for sat solver. %endif %prep -%autosetup -S git +%autosetup -p1 %if %{with python3} rm -rf %{py3dir} @@ -225,7 +212,7 @@ make ARGS="-V" test %doc examples/rbsolv %{ruby_vendorarch}/* -%files -n python-solv +%files -n python2-solv %doc examples/pysolv %{python2_sitearch}/* %endif @@ -237,9 +224,25 @@ make ARGS="-V" test %endif %changelog -* Tue Dec 08 2015 Jaroslav Mracek - 0.6.14-3 +* Thu Dec 17 2015 Igor Gnatenko - 0.6.15-1 +- Update to 0.6.15 + +* Tue Dec 08 2015 Jaroslav Mracek - 0.6.14-1 +- Rebase to upstream b1ea392 - Enable bz2 compression support (Mikolaj Izdebski ) (RhBug:1226647) +* Thu Nov 26 2015 Adam Williamson - 0.6.14-6 +- revert obsolete, as %python_provide does it (undocumented) + +* Wed Nov 18 2015 Adam Williamson - 0.6.14-5 +- adjust obsolete for stupid packaging + +* Wed Nov 18 2015 Adam Williamson - 0.6.14-4 +- python2-solv obsoletes python-solv (#1263230) + +* Tue Nov 10 2015 Fedora Release Engineering - 0.6.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Wed Oct 14 2015 Michal Luscon - 0.6.14-2 - Backport patches from upstream diff --git a/sources b/sources index a51763e..f6a5f63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bacd80472e4c8d5dd66d22f435f9258 libsolv-0.6.14.tar.gz +463a098ec418695af2d761ab6b08ceb5 libsolv-0.6.15.tar.gz