From 8fc425e16cfc2ac1d3572e19d95f2bed148e7f05 Mon Sep 17 00:00:00 2001 From: Jan Silhan Date: Fri, 25 Apr 2014 17:25:33 +0200 Subject: [PATCH] rebase to f78f5de --- .gitignore | 1 + libsolv.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4cee8c9..9d9e5ed 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libsolv-bcedc98.tar.xz /libsolv-05baf54.tar.gz /libsolv-05baf54.tar.xz +/libsolv-f78f5de.tar.xz diff --git a/libsolv.spec b/libsolv.spec index 5480eb1..4e93ee6 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 05baf54 +%global gitrev f78f5de %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')} %filter_provides_in %{perl_vendorarch}/.*\.so$ %filter_provides_in %{python_sitearch}/.*\.so$ @@ -6,8 +6,8 @@ %filter_setup Name: libsolv -Version: 0.6.0 -Release: 0.git%{gitrev}%{?dist}.1 +Version: 0.6.1 +Release: 0.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -153,10 +153,13 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %{python_sitearch}/* %changelog + +* Fri Apr 25 2014 Jan Silhan - 0.6.1-0.gitf78f5de +- Rebase to 0.6.0, upstream commit f78f5de. + * Thu Apr 24 2014 Vít Ondruch - 0.6.0-0.git05baf54.1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 - * Wed Apr 9 2014 Jan Silhan - 0.6.0-0.git05baf54 - Rebase to 0.6.0, upstream commit 05baf54. diff --git a/sources b/sources index d09a3f3..b2966df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -781b9b955837c549a1c6988b0256a395 libsolv-05baf54.tar.xz +79166e5d759b1c879bca4d167c02fc62 libsolv-f78f5de.tar.xz