From fef770994c9ddf2558dcc1822c0575c9f214270f Mon Sep 17 00:00:00 2001 From: Ales Kozumplik Date: Dec 16 2013 16:49:10 +0000 Subject: Merge branch 'master' into f20 --- diff --git a/.gitignore b/.gitignore index caf17d5..162a9c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libsolv-d49d319.tar.xz /libsolv-4442b7f.tar.xz +/libsolv-a8e47f1.tar.xz diff --git a/libsolv.spec b/libsolv.spec index 224f0bc..d9b6bda 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -1,4 +1,4 @@ -%global gitrev 4442b7f +%global gitrev a8e47f1 %{!?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.4.0 -Release: 2.git%{gitrev}%{?dist} +Version: 0.4.1 +Release: 0.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -153,6 +153,10 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %{python_sitearch}/* %changelog + +* Mon Dec 16 2013 Aleš Kozumplík - 0.4.1-0.gita8e47f1 +- Rebase to 0.4.1, upstream commit a8e47f1. + * Fri Nov 22 2013 Zdenek Pavlas - 0.4.0-2.git4442b7f - Rebase to 0.4.0, upstream commit 4442b7f. - support DELTA_LOCATION_BASE for completeness diff --git a/sources b/sources index 9e9e457..be95eb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac0e5b9f4bb428d08c575a74bd7dbeda libsolv-4442b7f.tar.xz +430d0ad9bbb1dd6df32d7e7087f6f624 libsolv-a8e47f1.tar.xz