rebase to 6d968f1

2014-05-27 16:34:16 +02:00 · 2014-05-27 16:34:16 +02:00 · a4f87354a3
commit a4f87354a3
parent 8fc425e16c
3 changed files with 8 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@
 /libsolv-05baf54.tar.gz
 /libsolv-05baf54.tar.xz
 /libsolv-f78f5de.tar.xz
+/libsolv-6d968f1.tar.xz
--- 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 <ales@redhat.com> - 0.6.1-1.git6d968f1
+- Rebase to upstream 6d968f1
+- Fix RhBug:1049209
+
 * Fri Apr 25 2014 Jan Silhan <jsilhan@redhat.com> - 0.6.1-0.gitf78f5de
 - Rebase to 0.6.0, upstream commit f78f5de.

--- a/2
+++ b/2
@ -1 +1 @@
-79166e5d759b1c879bca4d167c02fc62  libsolv-f78f5de.tar.xz
+198644b127734a61b9e34d2fd64896bf  libsolv-6d968f1.tar.xz