diff --git a/.gitignore b/.gitignore index d0657a3..b202895 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libsolv-12af31a.tar.xz /0.6.8.tar.gz /libsolv-78c8a55.tar.xz +/78c8a55bc087f45e231276ed5c33c84aed55463c.tar.gz diff --git a/libsolv.spec b/libsolv.spec index 76bd932..34a268f 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,7 +1,7 @@ -%global gitrev 78c8a55bc087f45e231276ed5c33c84aed55463c +%global gitrev 78c8a55 %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')} %filter_provides_in %{perl_vendorarch}/.*\.so$ -%filter_provides_in %{python_sitearch}/.*\.so$ +%filter_provides_in %{python3_sitearch}/.*\.so$ %filter_provides_in %{ruby_vendorarch}/.*\.so$ %filter_setup @@ -10,13 +10,15 @@ Version: 0.6.8 Release: 3%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv -Source: https://github.com/openSUSE/libsolv/archive/%{gitrev}.tar.gz +# git clone https://github.com/openSUSE/libsolv.git +# git archive %{gitrev} --prefix=libsolv/ | xz > libsolv-%{gitrev}.tar.xz +Source: libsolv-%{gitrev}.tar.xz Patch0: libsolv-rubyinclude.patch Patch1: libsolv-ruby22-rbconfig.patch Group: Development/Libraries Summary: Package dependency solver BuildRequires: cmake libdb-devel expat-devel rpm-devel zlib-devel -BuildRequires: swig perl perl-devel ruby ruby-devel python2-devel +BuildRequires: swig perl perl-devel ruby ruby-devel python3-devel BuildRequires: xz-devel %description A free package dependency solver using a satisfiability algorithm. The @@ -63,12 +65,12 @@ Group: Development/Languages %description -n ruby-solv Ruby bindings for sat solver. -%package -n python-solv +%package -n python3-solv Summary: Python bindings for the libsolv library Group: Development/Languages -Requires: python +Requires: python3 -%description -n python-solv +%description -n python3-solv Python bindings for sat solver. %package -n perl-solv @@ -80,7 +82,7 @@ Requires: perl Perl bindings for sat solver. %prep -%setup -q -n libsolv-%{gitrev} +%setup -q -n libsolv %patch0 -p1 -b .rubyinclude %patch1 -p1 -b .ruby-rbconfig @@ -148,9 +150,9 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %doc examples/rbsolv %{ruby_vendorarch}/* -%files -n python-solv +%files -n python3-solv %doc examples/pysolv -%{python_sitearch}/* +%{python3_sitearch}/* %changelog diff --git a/sources b/sources index c34fa71..66ec2cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af8a00c429a8bd262ce48d9fd29c14d0 libsolv-78c8a55.tar.xz +5c3fd2f220a352953084a4f2939e1dbe 78c8a55bc087f45e231276ed5c33c84aed55463c.tar.gz