[libsolv/f20] rebase

Ales Kozumplik akozumpl at fedoraproject.org
Thu Jan 23 13:26:48 UTC 2014


commit cab42e065dabc2f2462020fe2c24e694be4fdb4f
Author: Ales Kozumplik <ales at redhat.com>
Date:   Thu Jan 23 14:07:49 2014 +0100

    rebase

 .gitignore   |    1 +
 libsolv.spec |    8 ++++++--
 sources      |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 162a9c5..3dcf816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libsolv-d49d319.tar.xz
 /libsolv-4442b7f.tar.xz
 /libsolv-a8e47f1.tar.xz
+/libsolv-bcedc98.tar.xz
diff --git a/libsolv.spec b/libsolv.spec
index d9b6bda..33c87db 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -1,4 +1,4 @@
-%global gitrev a8e47f1
+%global gitrev bcedc98
 %{!?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.4.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
 
+* Mon Dec 16 2013 Aleš Kozumplík <akozumpl at redhat.com> - 0.4.1-1.gitbcedc98
+- Rebase upstream bcedc98
+- Fix RhBug:1051917.
+
 * Mon Dec 16 2013 Aleš Kozumplík <akozumpl at redhat.com> - 0.4.1-0.gita8e47f1
 - Rebase to 0.4.1, upstream commit a8e47f1.
 
diff --git a/sources b/sources
index be95eb5..fffeb33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-430d0ad9bbb1dd6df32d7e7087f6f624  libsolv-a8e47f1.tar.xz
+c7c083898d102e86f59f236caa05d765  libsolv-bcedc98.tar.xz


More information about the scm-commits mailing list