From c4491bc0aaa0bc0ffb4a91f60bf9b8e91812add3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 29 Jan 2018 17:43:57 +0100 Subject: [PATCH] Update to latest git version Also switch to use librpm for accessing rpmdb and headers. Signed-off-by: Igor Gnatenko --- .gitignore | 1 + libsolv.spec | 70 +++++++++++++++++++++++++--------------------------- sources | 2 +- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index f506925..cce0b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /libsolv-0.6.29.tar.gz /libsolv-0.6.30.tar.gz /libsolv-97b8c0c.tar.gz +/libsolv-ae214a6.tar.gz diff --git a/libsolv.spec b/libsolv.spec index ac83378..157ed71 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -36,8 +36,8 @@ %bcond_without multi_semantics %endif -%global commitnum 2887 -%global commit 97b8c0c2cd220b05bf2758803744bf9b58233595 +%global commitnum 2898 +%global commit ae214a654c4c0f3b43ca763e70bde4793d00422a %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: lib%{libname} @@ -59,9 +59,6 @@ BuildRequires: pkgconfig(rpm) BuildRequires: zlib-devel # -DWITH_LIBXML2=ON BuildRequires: libxml2-devel -# -DFEDORA=1 -# -DENABLE_RPMDB=ON -BuildRequires: libdb-devel # -DENABLE_LZMA_COMPRESSION=ON BuildRequires: xz-devel # -DENABLE_BZIP2_COMPRESSION=ON @@ -162,48 +159,45 @@ Python 3 version. %prep %autosetup -p1 %{?commit:-n %{name}-%{commit}} -mkdir build %build -pushd build - %cmake \ - -DFEDORA=1 \ - -DENABLE_RPMDB=ON \ - -DENABLE_RPMDB_BYRPMHEADER=ON \ - -DENABLE_RPMMD=ON \ - %{?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} \ - %{?with_suse_repo:-DENABLE_SUSEREPO=ON} \ - %{?with_debian_repo:-DENABLE_DEBIAN=ON} \ - %{?with_arch_repo:-DENABLE_ARCHREPO=ON} \ - %{?with_multi_semantics:-DMULTI_SEMANTICS=ON} \ - %{?with_complex_deps:-DENABLE_COMPLEX_DEPS=1} \ - %{?with_perl_bindings:-DENABLE_PERL=ON} \ - %{?with_ruby_bindings:-DENABLE_RUBY=ON} \ +%cmake . -B"%{_vpath_builddir}" \ + -DFEDORA=1 \ + -DENABLE_RPMDB=ON \ + -DENABLE_RPMDB_BYRPMHEADER=ON \ + -DENABLE_RPMDB_LIBRPM=ON \ + -DENABLE_RPMPKG_LIBRPM=ON \ + -DENABLE_RPMMD=ON \ + %{?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} \ + %{?with_suse_repo:-DENABLE_SUSEREPO=ON} \ + %{?with_debian_repo:-DENABLE_DEBIAN=ON} \ + %{?with_arch_repo:-DENABLE_ARCHREPO=ON} \ + %{?with_multi_semantics:-DMULTI_SEMANTICS=ON} \ + %{?with_complex_deps:-DENABLE_COMPLEX_DEPS=1} \ + %{?with_perl_bindings:-DENABLE_PERL=ON} \ + %{?with_ruby_bindings:-DENABLE_RUBY=ON} \ %if %{with python_bindings} - -DENABLE_PYTHON=ON \ + -DENABLE_PYTHON=ON \ %if %{with python3} - -DENABLE_PYTHON3=ON \ + -DENABLE_PYTHON3=ON \ %endif %endif - .. - %make_build -popd + %{nil} +%make_build -C "%{_vpath_builddir}" %install -pushd build - %make_install -popd +%make_install -C "%{_vpath_builddir}" -mv %{buildroot}%{_bindir}/repo2solv.sh %{buildroot}%{_bindir}/repo2solv +mv %{buildroot}%{_bindir}/repo2solv{.sh,} %check -pushd build +pushd "%{_vpath_builddir}" ctest -VV popd @@ -294,6 +288,10 @@ popd %endif %changelog +* Mon Jan 29 2018 Igor Gnatenko - 0.6.30-3.git.2898.ae214a6 +- Update to latest git version +- Switch to use librpm for accessing headers / rpmdb + * Mon Nov 20 2017 Igor Gnatenko - 0.6.30-3.git.2887.97b8c0c - Update to latest snapshot diff --git a/sources b/sources index aadff51..773e5ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsolv-97b8c0c.tar.gz) = 15ea0880586e147c487fa0fbc54d183871487729ddfa3b79012287fe281ffc6e4c5c1141ec9fcd9cb49a8fe138d1f3562bb606a725a4456a9a1641279dee17c7 +SHA512 (libsolv-ae214a6.tar.gz) = e59a8db8442ca71735936603dbd76ee8a69f9a9a22b2650d9e55f8f8a74276e77b4a6747f58a87321152253c326d55b3e33e8c50d9b1218d6b23f16778b5524d