Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[libsolv] Update to 0.7.11 and update python3. Fixes JB#48594
  • Loading branch information
Lauri Kopo committed Jan 31, 2020
1 parent bc8fff9 commit 53f07b5
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "upstream"]
path = upstream
url = https://github.com/openSUSE/libsolv.git
url = https://git.sailfishos.org/mirror/libsolv.git
30 changes: 0 additions & 30 deletions rpm/0001-Fix-repo2solv-to-work-with-Busybox-find-tool.patch

This file was deleted.

49 changes: 23 additions & 26 deletions rpm/libsolv.spec
@@ -1,10 +1,9 @@
%global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True);")
%global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))")

Name: libsolv
Summary: A new approach to package dependency solving
Version: 0.6.35
Version: 0.7.11
Release: 1
Group: Development/Libraries/C and C++
License: BSD
URL: https://github.com/openSUSE/libsolv
Source0: %{name}-%{version}.tar.gz
Expand All @@ -15,13 +14,11 @@ BuildRequires: xz-devel
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: perl-devel
BuildRequires: python-devel
BuildRequires: python3-devel
BuildRequires: swig
BuildRequires: cmake
BuildRequires: libxml2-devel

Patch1: 0001-Fix-repo2solv-to-work-with-Busybox-find-tool.patch

%description
A new approach to package dependency solving.

Expand All @@ -35,13 +32,13 @@ Requires: libsolv0 = %version
%description demo
Applications demoing the libsolv library.

%package -n python-solv
%package -n python3-solv
Summary: Python bindings for the libsolv library
Group: Development/Languages/Python
Requires: libsolv0 = %version

%description -n python-solv
Python bindings for sat solver.
%description -n python3-solv
Python3 bindings for sat solver.

%package devel
Summary: A new approach to package dependency solving
Expand Down Expand Up @@ -88,8 +85,7 @@ Obsoletes: satsolver-tools < 0.18
A new approach to package dependency solving.

%prep
%setup -q -n %{name}-%{version}/upstream
%patch1 -p1
%autosetup -p1 -n %{name}-%{version}/upstream

%build
%cmake . \
Expand All @@ -108,7 +104,7 @@ A new approach to package dependency solving.
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_PERL=1 \
-DENABLE_PYTHON=1 \
-DENABLE_PYTHON3=1 \
-DUSE_VENDORDIRS=1 \
-DCMAKE_SKIP_RPATH=1 \
-DWITH_LIBXML2=1 \
Expand All @@ -127,13 +123,17 @@ export NO_BRP_STRIP_DEBUG=true
%postun -n libsolv0 -p /sbin/ldconfig


%files demo
%files -n libsolv0
%defattr(-,root,root,-)
%{_bindir}/solv
%doc LICENSE*
%{_libdir}/libsolv.so.*
%{_libdir}/libsolvext.so.*

%files -n python-solv
%files tools
%defattr(-,root,root,-)
%{python_sitearch}/*
%exclude %{_bindir}/helix2solv
%exclude %{_bindir}/solv
%{_bindir}/*

%files devel
%defattr(-,root,root,-)
Expand All @@ -146,18 +146,15 @@ export NO_BRP_STRIP_DEBUG=true
%{_libdir}/pkgconfig/libsolvext.pc
%{_datadir}/man/man?/*.?.gz

%files -n perl-solv
%files demo
%defattr(-,root,root,-)
%{perl_vendorarch}/*
%{_bindir}/solv

%files -n libsolv0
%files -n perl-solv
%defattr(-,root,root,-)
%doc LICENSE*
%{_libdir}/libsolv.so.*
%{_libdir}/libsolvext.so.*
%{perl_vendorarch}/*

%files tools
%files -n python3-solv
%defattr(-,root,root,-)
%exclude %{_bindir}/helix2solv
%exclude %{_bindir}/solv
%{_bindir}/*
%{python3_sitearch}/*solv*
%{python3_sitearch}/__pycache__/solv.*
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 38c537 to 102ac5

0 comments on commit 53f07b5

Please sign in to comment.