rpms/libsolv
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Switch to ninja-build

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-01-29 17:49:53 +01:00
parent c4491bc0aa
commit 88c755217c
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolv.spec
View File

@ -42,7 +42,7 @@
Name: lib%{libname} Name: lib%{libname}
Version: 0.6.30 Version: 0.6.30
Release: 3%{?commit:.git.%{commitnum}.%{?shortcommit}}%{?dist} Release: 4%{?commit:.git.%{commitnum}.%{?shortcommit}}%{?dist}
Summary: Package dependency solver Summary: Package dependency solver
License: BSD License: BSD
@ -55,6 +55,7 @@ Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: ninja-build
BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(rpm)
BuildRequires: zlib-devel BuildRequires: zlib-devel
# -DWITH_LIBXML2=ON # -DWITH_LIBXML2=ON
@ -161,7 +162,7 @@ Python 3 version.
%autosetup -p1 %{?commit:-n %{name}-%{commit}} %autosetup -p1 %{?commit:-n %{name}-%{commit}}
%build %build
%cmake . -B"%{_vpath_builddir}" \ %cmake . -B"%{_vpath_builddir}" -GNinja \
-DFEDORA=1 \ -DFEDORA=1 \
-DENABLE_RPMDB=ON \ -DENABLE_RPMDB=ON \
-DENABLE_RPMDB_BYRPMHEADER=ON \ -DENABLE_RPMDB_BYRPMHEADER=ON \
@ -189,17 +190,15 @@ Python 3 version.
%endif %endif
%endif %endif
%{nil} %{nil}
%make_build -C "%{_vpath_builddir}" %ninja_build -C "%{_vpath_builddir}"
%install %install
%make_install -C "%{_vpath_builddir}" %ninja_install -C "%{_vpath_builddir}"
mv %{buildroot}%{_bindir}/repo2solv{.sh,} mv %{buildroot}%{_bindir}/repo2solv{.sh,}
%check %check
pushd "%{_vpath_builddir}" %ninja_test -C "%{_vpath_builddir}"
ctest -VV
popd
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -288,6 +287,9 @@ popd
%endif %endif
%changelog %changelog
* Mon Jan 29 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.30-4.git.2898.ae214a6
- Switch to ninja-build
* Mon Jan 29 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.30-3.git.2898.ae214a6 * Mon Jan 29 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.30-3.git.2898.ae214a6
- Update to latest git version - Update to latest git version
- Switch to use librpm for accessing headers / rpmdb - Switch to use librpm for accessing headers / rpmdb