From a4f87354a3e8b1c6ae5588f57534615f4e06b6b1 Mon Sep 17 00:00:00 2001 From: Ales Kozumplik Date: Tue, 27 May 2014 16:34:16 +0200 Subject: [PATCH] rebase to 6d968f1 --- .gitignore | 1 + libsolv.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9d9e5ed..70c3282 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libsolv-05baf54.tar.gz /libsolv-05baf54.tar.xz /libsolv-f78f5de.tar.xz +/libsolv-6d968f1.tar.xz diff --git a/libsolv.spec b/libsolv.spec index 4e93ee6..2e68946 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev f78f5de +%global gitrev 6d968f1 %{!?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.1 -Release: 0.git%{gitrev}%{?dist} +Release: 1.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -154,6 +154,10 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %changelog +* Tue May 27 2014 Aleš Kozumplík - 0.6.1-1.git6d968f1 +- Rebase to upstream 6d968f1 +- Fix RhBug:1049209 + * Fri Apr 25 2014 Jan Silhan - 0.6.1-0.gitf78f5de - Rebase to 0.6.0, upstream commit f78f5de. diff --git a/sources b/sources index b2966df..e7d7a0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79166e5d759b1c879bca4d167c02fc62 libsolv-f78f5de.tar.xz +198644b127734a61b9e34d2fd64896bf libsolv-6d968f1.tar.xz