From ab2d2a14417c746a6d05f29a17e4bc9a2d60e049 Mon Sep 17 00:00:00 2001 From: Ales Kozumplik Date: Wed, 31 Jul 2013 17:35:36 +0200 Subject: [PATCH] Rebase to upstream a59d11d --- .gitignore | 14 +------------- libsolv.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 1b35b9a..2f8631b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -/libsolv-857fe28.tar.xz -/libsolv-80afaf7.tar.xz -/libsolv-af1465a2.tar.xz -/libsolv-8cf7650.tar.xz -/libsolv-d39a42b.tar.xz -/libsolv-1617994.tar.xz -/libsolv-1617994.tar.xz -/libsolv-6c9d3eb.tar.xz -/libsolv-f663ca2.tar.xz -/libsolv-e372b78.tar.xz -/libsolv-7399ad1.tar.xz -/libsolv-209e9cb.tar.xz -/libsolv-228d412.tar.xz +/libsolv-a59d11d.tar.xz \ No newline at end of file diff --git a/libsolv.spec b/libsolv.spec index fac57dc..c8aed49 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 228d412 +%global gitrev a59d11d %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')} %filter_provides_in %{perl_vendorarch}/.*\.so$ %filter_provides_in %{python_sitearch}/.*\.so$ @@ -7,7 +7,7 @@ Name: libsolv Version: 0.3.0 -Release: 7.git%{gitrev}%{?dist} +Release: 8.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -154,6 +154,9 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %changelog +* Wed Jul 31 2013 Aleš Kozumplík - 0.3.0-8.gita59d11d +- Rebase to upstream a59d11d. + * Fri Jul 19 2013 Aleš Kozumplík - 0.3.0-7.git228d412 - Add build flags, including Deb, Arch, LZMA and MULTI_SEMANTICS. (RhBug:985905) diff --git a/sources b/sources index f15c31d..4d133c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83b46ade1b63440106df8248e1e5aa93 libsolv-228d412.tar.xz +395931c5b5c3bd5eb14bae417e4bea31 libsolv-a59d11d.tar.xz