From 22cd67cb4ac54c92ace8b13c269bbbe38fd1d4de Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Thu, 6 Aug 2015 00:12:44 +0300
Subject: [PATCH] really upload sources + spec cleanup from patch

we should define which really git revision is in Release tag[0] as
per packaging guidelines.

Also patch is not needed, because Jan has updated git revision where
patch already applied.

[0] https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Snapshot_packages

Cc: Colin Walters <walters@verbum.org>
Cc: Jan Silhan <jsilhan@redhat.com>
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 .gitignore   | 1 +
 libsolv.spec | 8 +++-----
 sources      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee9887e..47fe2ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /850794025c60bf3efe8bd9e402a19cfe83b2fd7b.tar.gz
 /99edb54e18f4971f50a359803633f44fdeb08428.tar.gz
 /2db517f87a8c0364d28c0fa2590ba034e866a4b8.tar.gz
+/libsolv-1f9abfb.tar.gz
diff --git a/libsolv.spec b/libsolv.spec
index 1bb1008..d94b540 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -1,4 +1,5 @@
 %global gitrev 1f9abfb5b1bb18a8f46887fa2541957e74132567
+%global shortcommit %(c=%{gitrev}; echo ${c:0:7})
 %{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir'].nil? ? RbConfig::CONFIG['sitearchdir'] : RbConfig::CONFIG['vendorarchdir']")}
 %filter_provides_in %{perl_vendorarch}/.*\.so$
 %filter_provides_in %{python2_sitearch}/.*\.so$
@@ -31,13 +32,11 @@
 
 Name:		libsolv
 Version:	0.6.11
-Release:	3%{?dist}
+Release:	3.git%{shortcommit}%{?dist}
 License:	BSD
 Url:		https://github.com/openSUSE/libsolv
-Source:		https://github.com/openSUSE/libsolv/archive/%{gitrev}.tar.gz
+Source:		https://github.com/openSUSE/libsolv/archive/%{gitrev}.tar.gz#/%{name}-%{shortcommit}.tar.gz
 Patch0:		libsolv-rubyinclude.patch
-# https://github.com/openSUSE/libsolv/commit/204406df09b45e1316f02f1f629ef79574530b3d
-Patch1:		0001-Specify-PYTHONLIBS_VERSION_STRING-on-the-FIND_PACKAG.patch
 Group:		Development/Libraries
 Summary:	Package dependency solver
 BuildRequires:	cmake libdb-devel expat-devel rpm-devel zlib-devel
@@ -135,7 +134,6 @@ Perl bindings for sat solver.
 %prep
 %setup -q -n libsolv-%{gitrev}
 %patch0 -p1 -b .rubyinclude
-%patch1 -p1 -b .python3
 
 %if %{with python3}
 rm -rf %{py3dir}
diff --git a/sources b/sources
index 49233bf..78ec42d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d8b7f139075dcc242b44b062e4ce91e  2db517f87a8c0364d28c0fa2590ba034e866a4b8.tar.gz
+635e0592bad44aca9c8deb883c5d84a3  libsolv-1f9abfb.tar.gz