From 88c71ef5bdbe77981b647032b5b951c229cbf3aa Mon Sep 17 00:00:00 2001 From: Jan Silhan Date: Mon, 14 Jul 2014 18:11:21 +0200 Subject: [PATCH] rebase to 3a5c1c4 --- .gitignore | 1 + libsolv.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 70c3282..d73fee8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /libsolv-05baf54.tar.xz /libsolv-f78f5de.tar.xz /libsolv-6d968f1.tar.xz +/libsolv-2a5c1c4.tar.xz diff --git a/libsolv.spec b/libsolv.spec index 2fa688e..8a0b82a 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -6,8 +6,8 @@ %filter_setup Name: libsolv -Version: 0.6.1 -Release: 2.git%{gitrev}%{?dist} +Version: 0.6.4 +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 +* Mon Jul 14 2014 Jan Silhan - 0.6.4-0.git2a5c1c4 +- Rebase to upstream 2a5c1c4 +- Filename selector can start with a star + * Sat Jun 07 2014 Fedora Release Engineering - 0.6.1-2.git6d968f1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - * Tue May 27 2014 Aleš Kozumplík - 0.6.1-1.git6d968f1 - Rebase to upstream 6d968f1 - Fix RhBug:1049209 diff --git a/sources b/sources index e7d7a0c..80c05de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -198644b127734a61b9e34d2fd64896bf libsolv-6d968f1.tar.xz +545caea6b396c74e86602ae18c3ad203 libsolv-2a5c1c4.tar.xz