From a5902b6c02cfe6f5f1338da3744f4c25e029fcde Mon Sep 17 00:00:00 2001
From: Jaroslav Mracek <jmracek@redhat.com>
Date: Tue, 26 Jun 2018 12:43:44 +0200
Subject: [PATCH] Update to 0.15.0

Additionally it reverts %ldconfig_scriptlets due to compatibility with
Centos7/RHEL7
---
 .gitignore  |  1 +
 libdnf.spec | 63 ++++++++++++++++++++++++++++++++++++++++++++---------
 sources     |  2 +-
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9f7f2b..1324378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /libdnf-0.10.1.tar.gz
 /libdnf-0.11.0.tar.gz
 /libdnf-0.11.1.tar.gz
+/libdnf-0.15.0.tar.gz
diff --git a/libdnf.spec b/libdnf.spec
index be75781..45e7dd3 100644
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -1,5 +1,7 @@
-%global libsolv_version 0.6.21-1
-%global dnf_conflict 2.7.2
+%global libsolv_version 0.6.30-1
+%global libmodulemd_version 1.4.0
+%global dnf_conflict 3.0.0
+%global swig_version 3.0.12
 
 %bcond_with valgrind
 
@@ -21,8 +23,8 @@
     %{nil}
 
 Name:           libdnf
-Version:        0.11.1
-Release:        6%{?dist}
+Version:        0.15.0
+Release:        1%{?dist}
 Summary:        Library providing simplified C and Python API to libsolv
 License:        LGPLv2+
 URL:            https://github.com/rpm-software-management/libdnf
@@ -30,6 +32,7 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake
 BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  libsolv-devel >= %{libsolv_version}
 BuildRequires:  pkgconfig(librepo)
 BuildRequires:  pkgconfig(check)
@@ -38,12 +41,16 @@ BuildRequires:  valgrind
 %endif
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.46.0
 BuildRequires:  pkgconfig(gtk-doc)
-BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  rpm-devel >= 4.11.0
 %if %{with rhsm}
 BuildRequires:  pkgconfig(librhsm)
 %endif
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(cppunit)
+BuildRequires:  pkgconfig(modulemd) >= %{libmodulemd_version}
 
+Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
 Requires:       libsolv%{?_isa} >= %{libsolv_version}
 
 %description
@@ -57,6 +64,31 @@ Requires:       libsolv-devel%{?_isa} >= %{libsolv_version}
 %description devel
 Development files for %{name}.
 
+%package -n python2-%{name}
+%{?python_provide:%python_provide python2-%{name}}
+Summary:        Python 2 bindings for the libdnf library.
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  python2-devel
+BuildRequires:  python2-sphinx
+BuildRequires:  swig >= %{swig_version}
+
+%description -n python2-%{name}
+Python 2 bindings for the libdnf library.
+
+
+%if %{with python3}
+%package -n python3-%{name}
+%{?python_provide:%python_provide python3-%{name}}
+Summary:        Python 3 bindings for the libdnf library.
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  python3-devel
+BuildRequires:  python3-sphinx
+BuildRequires:  swig >= %{swig_version}
+
+%description -n python3-%{name}
+Python 3 bindings for the libdnf library.
+%endif
+
 %package -n python2-hawkey
 Summary:        Python 2 bindings for the hawkey library
 %{?python_provide:%python_provide python2-hawkey}
@@ -100,7 +132,7 @@ mkdir build-py3
 
 %build
 pushd build-py2
-  %cmake -DWITH_MAN=OFF ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}
+  %cmake -DPYTHON_DESIRED:str=2 -DWITH_MAN=OFF ../ %{!?with_valgrind:-DDISABLE_VALGRIND=1} %{_cmake_opts}
   %make_build
 popd
 
@@ -119,6 +151,7 @@ Please build the package as non-root user.
 ERROR
         exit 1
 fi
+
 pushd build-py2
   make ARGS="-V" test
 popd
@@ -140,20 +173,27 @@ pushd build-py3
 popd
 %endif
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %license COPYING
-%doc README.md AUTHORS NEWS
+%doc README.md AUTHORS
 %{_libdir}/%{name}.so.*
-%{_libdir}/girepository-1.0/Dnf-*.typelib
 
 %files devel
 %doc %{_datadir}/gtk-doc/html/%{name}/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
-%{_datadir}/gir-1.0/Dnf-*.gir
+
+%files -n python2-%{name}
+%{python2_sitearch}/%{name}/
+
+%if %{with python3}
+%files -n python3-%{name}
+%{python3_sitearch}/%{name}/
+%endif
 
 %files -n python2-hawkey
 %{python2_sitearch}/hawkey/
@@ -164,6 +204,9 @@ popd
 %endif
 
 %changelog
+* Tue Jun 26 2018 Jaroslav Mracek <> - 0.15.0-1
+- Update to 0.15.0
+
 * Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 0.11.1-6
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index 7b654cc..b72f0ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libdnf-0.11.1.tar.gz) = fe64f38abd87c69c199c743d0715cb31928795a870c46069628eb211d8625d04452b549f617bac54c82fb941a3a7bd357d973b6411e4c36a9ca2a50497fc5528
+SHA512 (libdnf-0.15.0.tar.gz) = ebe42f19c8e99be8717b8e3b6109c2928d9539df3a7ab02da9c19c7fab1266ba9a7ff064d757965d0582a72d952fc0179b0f2f1eada42c23c6d7341c754f96d6