From 087fbc9fbf967aa85f2726b564547f8ec6e7cefc Mon Sep 17 00:00:00 2001
From: Jan Silhan <jsilhan@redhat.com>
Date: Mon, 22 Jun 2015 19:15:46 +0200
Subject: [PATCH] New version: 2db517f

---
 .gitignore                    |  1 +
 libsolv-ruby22-rbconfig.patch | 20 --------------------
 libsolv.spec                  | 14 ++++++++------
 sources                       |  2 +-
 4 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 libsolv-ruby22-rbconfig.patch

diff --git a/.gitignore b/.gitignore
index f6df5c6..ee9887e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /78c8a55bc087f45e231276ed5c33c84aed55463c.tar.gz
 /850794025c60bf3efe8bd9e402a19cfe83b2fd7b.tar.gz
 /99edb54e18f4971f50a359803633f44fdeb08428.tar.gz
+/2db517f87a8c0364d28c0fa2590ba034e866a4b8.tar.gz
diff --git a/libsolv-ruby22-rbconfig.patch b/libsolv-ruby22-rbconfig.patch
deleted file mode 100644
index 0cc8e10..0000000
--- a/libsolv-ruby22-rbconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/modules/FindRuby.cmake
-+++ b/cmake/modules/FindRuby.cmake
-@@ -86,7 +86,7 @@
-       OUTPUT_VARIABLE _RUBY_OUTPUT
-       ERROR_QUIET)
-     IF(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT)
--      EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
-+      EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
-         RESULT_VARIABLE _RUBY_SUCCESS
-         OUTPUT_VARIABLE _RUBY_OUTPUT
-         ERROR_QUIET)
-@@ -112,7 +112,7 @@
-    _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
- 
-    # vendor_ruby available ?
--   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?"
-+   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?"
-       OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
- 
-    IF(RUBY_HAS_VENDOR_RUBY)
diff --git a/libsolv.spec b/libsolv.spec
index 0422cc9..45cf179 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -1,18 +1,17 @@
-%global gitrev 99edb54e18f4971f50a359803633f44fdeb08428
-%{!?ruby_vendorarch: %global ruby_vendorarch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] ')}
+%global gitrev 2db517f87a8c0364d28c0fa2590ba034e866a4b8
+%{!?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 %{python_sitearch}/.*\.so$
 %filter_provides_in %{ruby_vendorarch}/.*\.so$
 %filter_setup
 
 Name:		libsolv
-Version:	0.6.10
-Release:	2%{?dist}
+Version:	0.6.11
+Release:	1%{?dist}
 License:	BSD
 Url:		https://github.com/openSUSE/libsolv
 Source:		https://github.com/openSUSE/libsolv/archive/%{gitrev}.tar.gz
 Patch0:		libsolv-rubyinclude.patch
-Patch1:		libsolv-ruby22-rbconfig.patch
 Group:		Development/Libraries
 Summary:	Package dependency solver
 BuildRequires:	cmake libdb-devel expat-devel rpm-devel zlib-devel
@@ -82,7 +81,6 @@ Perl bindings for sat solver.
 %prep
 %setup -q -n libsolv-%{gitrev}
 %patch0 -p1 -b .rubyinclude
-%patch1 -p1 -b .ruby-rbconfig
 
 %check
 make ARGS="-V" test
@@ -153,6 +151,10 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv
 %{python_sitearch}/*
 
 %changelog
+* Mon Jun 22 2015 Jan Silhan <jsilhan@redhat.com> - 0.6.11-1
+- new version fixing segfault
+- RbConfig fixed in the upstream (1928f1a), libsolv-ruby22-rbconfig.patch erased
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 1564c1b..49233bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ff37ddd3e7f287a441f16542c6f09d2  99edb54e18f4971f50a359803633f44fdeb08428.tar.gz
+1d8b7f139075dcc242b44b062e4ce91e  2db517f87a8c0364d28c0fa2590ba034e866a4b8.tar.gz