From 1b7c9c6efd2098cf6747b96f70b7472f1888ea9d Mon Sep 17 00:00:00 2001 From: Jan Silhan Date: Mon, 11 Aug 2014 15:50:53 +0200 Subject: [PATCH] rebase to 12af31a --- .gitignore | 1 + libsolv.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 50d64da..be4bdc4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libsolv-6d968f1.tar.xz /libsolv-2a5c1c4.tar.xz /libsolv-5bd9589.tar.xz +/libsolv-12af31a.tar.xz diff --git a/libsolv.spec b/libsolv.spec index c6296b5..c208326 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 5bd9589 +%global gitrev 12af31a %{!?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.6.4 -Release: 1%{?dist} +Release: 2%{?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 +* Mon Aug 11 2014 Jan Silhan - 0.6.4-2 +- Rebase to upstream 12af31a + * Mon Jul 28 2014 Aleš Kozumplík - 0.6.4-1 - Rebase to upstream 5bd9589 diff --git a/sources b/sources index e6b0c92..f2789a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10f36ce353a31bd5ece6c12aada024f2 libsolv-5bd9589.tar.xz +f3e200946331efe0b561ab6287f0dc21 libsolv-12af31a.tar.xz