Update to latest git; Switch to libxml2
libxml2 is 30% faster than expat as stated by mls. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
0395f8a028
commit
394695c969
1
.gitignore
vendored
1
.gitignore
vendored
@ -27,3 +27,4 @@
|
||||
/libsolv-0.6.24.tar.gz
|
||||
/libsolv-0.6.25.tar.gz
|
||||
/libsolv-0.6.26.tar.gz
|
||||
/libsolv-2262346.tar.gz
|
||||
|
25
libsolv.spec
25
libsolv.spec
@ -1,5 +1,10 @@
|
||||
%global libname solv
|
||||
|
||||
# number of commits since last release
|
||||
%global gitnum 19
|
||||
%global commit 22623468dcdfeeaafeec3bd6789dfaf739eb7664
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%bcond_with perl_bindings
|
||||
%bcond_with ruby_bindings
|
||||
@ -39,20 +44,23 @@
|
||||
|
||||
Name: lib%{libname}
|
||||
Version: 0.6.26
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?commit:.git.%{gitnum}.%{shortcommit}}%{?dist}
|
||||
Summary: Package dependency solver
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/openSUSE/libsolv
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# https://github.com/openSUSE/libsolv/pull/184
|
||||
Patch0001: 0001-build-do-not-ignore-PYTHON3_EXECUTABLE.patch
|
||||
%if %{undefined commit}
|
||||
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
%else
|
||||
Source: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
|
||||
%endif
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig(rpm)
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: expat-devel
|
||||
# -DWITH_LIBXML2=ON
|
||||
BuildRequires: libxml2-devel
|
||||
# -DFEDORA=1
|
||||
# -DENABLE_RPMDB=ON
|
||||
BuildRequires: libdb-devel
|
||||
@ -155,7 +163,7 @@ Python 3 version.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 %{?commit:-n %{name}-%{commit}}
|
||||
mkdir build
|
||||
|
||||
%build
|
||||
@ -168,6 +176,7 @@ pushd build
|
||||
%{?with_comps:-DENABLE_COMPS=ON} \
|
||||
%{?with_appdata:-DENABLE_APPDATA=ON} \
|
||||
-DUSE_VENDORDIRS=ON \
|
||||
-DWITH_LIBXML2=ON \
|
||||
-DENABLE_LZMA_COMPRESSION=ON \
|
||||
-DENABLE_BZIP2_COMPRESSION=ON \
|
||||
%{?with_helix_repo:-DENABLE_HELIXREPO=ON} \
|
||||
@ -288,6 +297,10 @@ popd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Mar 16 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.26-3.git.19.2262346
|
||||
- Update to latest git
|
||||
- Switch to libxml2
|
||||
|
||||
* Mon Mar 06 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.26-2
|
||||
- Use %%{__python3} as PYTHON3_EXECUTABLE
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libsolv-0.6.26.tar.gz) = 3966b0dfb749ddf6450ee46e8f9e9d6a22a2d57f13c3f77a32e7d1dcd8a9ba22fa85bdc4cbd502bff910dc4ed82a31422c71ae681e89155350dfbae5ce66a256
|
||||
SHA512 (libsolv-2262346.tar.gz) = 3b0471ad778e08b81c45b51ee4e2292a1a5e52b7e570434630a03f31ec1166702c12f96a17e49dd9c73f36daa446bf74a4e88772b10838349e2fd1a7332319b5
|
||||
|
Loading…
Reference in New Issue
Block a user