- up to 0.60.0, added python*-libdnf packages

diff --git a/libdnf.spec b/libdnf.spec
index 20dc6adec2d571f6b8a74ba3fde91a60f93edbe0..baf818c2f5cb8ae3a109a82907ac18096174480c 100644 (file)
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -8,33 +8,45 @@
 Summary:       Library providing simplified C and Python API to libsolv
 Summary(pl.UTF-8):     Biblioteka zapewniająca uproszczone API C i Pythona do libsolv
 Name:          libdnf
-Version:       0.11.1
-Release:       7
+Version:       0.60.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 #Source0Download: https://github.com/rpm-software-management/libdnf/releases
 Source0:       https://github.com/rpm-software-management/libdnf/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d62c97d5534394c365fe77978ce9cdd5
+# Source0-md5: 1b43ad8d22b40c95441c0a6370141599
 Patch0:                %{name}-rpm5.patch
 URL:           https://github.com/rpm-software-management/libdnf
 BuildRequires: check-devel
 BuildRequires: cmake >= 2.4
+BuildRequires: cppunit-devel
+BuildRequires: gettext
 BuildRequires: glib2-devel >= 1:2.46.0
 BuildRequires: gobject-introspection-devel
+BuildRequires: gpgme-devel
 BuildRequires: gtk-doc
-BuildRequires: librepo-devel
+BuildRequires: json-c-devel
+BuildRequires: libmodulemd-devel >= 2.12.0
+BuildRequires: librepo-devel >= 1.13.0
 %{?with_rhsm:BuildRequires:    librhsm-devel}
-BuildRequires: libsolv-devel >= 0.6.21
+BuildRequires: libsmartcols-devel
+BuildRequires: libsolv-devel >= 0.7.17
+BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: sphinx-pdg
+BuildRequires: sqlite3-devel
 BuildRequires: valgrind
+BuildRequires: zchunk-devel >= 0.9.11
 Requires:      glib2 >= 1:2.46.0
-Requires:      libsolv >= 0.6.21
+Requires:      libsolv >= 0.7.17
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# PyErr_Format(HyExc_Exception, e.what());
+%define                filterout       -Wformat -Werror=format-security
+
 # hawkey(3) man page shared between python-hawkey and python3-hawkey
 %define                _duplicate_files_terminate_build        0
 
@@ -51,8 +63,8 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2-devel >= 1:2.46.0
 Requires:      librepo-devel
-Requires:      libsolv-devel >= 0.6.21
-Requires:      rpm-devel >= 5
+Requires:      libsolv-devel >= 0.7.17
+Requires:      rpm-devel
 
 %description devel
 Header files for libdnf library.
@@ -133,6 +145,30 @@ API documentation for Python hawkey module.
 %description -n python-hawkey-apidocs -l pl.UTF-8
 Dokumentacja API modułu Pythona hawkey.
 
+%package -n python-libdnf
+Summary:       Python 2.x bindings for libdnf library
+Summary(pl.UTF-8):     Wiązania Pythona 2.x do biblioteki libdnf
+Group:         Libraries/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n python-libdnf
+Python 2.x bindings for hawkey libdnf.
+
+%description -n python-libdnf -l pl.UTF-8
+Wiązania Pythona 2.x do biblioteki libdnf.
+
+%package -n python3-libdnf
+Summary:       Python 3.x bindings for libdnf library
+Summary(pl.UTF-8):     Wiązania Pythona 3.x do biblioteki libdnf
+Group:         Libraries/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n python3-libdnf
+Python 3.x bindings for hawkey library.
+
+%description -n python3-libdnf -l pl.UTF-8
+Wiązania Pythona 3.x do biblioteki libdnf.
+
 %prep
 %setup -q
 %{?with_rpm5:%patch0 -p1}
@@ -142,7 +178,8 @@ export CFLAGS="%{rpmcflags} -D_GNU_SOURCE}"
 install -d build %{?with_python3:build-py3}
 cd build
 %cmake .. \
-       %{?with_rhsm:-DENABLE_RHSM_SUPPORT=ON}
+       %{?with_rhsm:-DENABLE_RHSM_SUPPORT=ON} \
+       -DPYTHON_DESIRED=2
 
 %{__make}
 %{__make} doc-html
@@ -165,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/hawkey
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/hawkey
+
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/libdnf
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/libdnf
 %endif
 
 %{__make} -C build install \
@@ -172,28 +212,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}/hawkey
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/hawkey
+
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}/libdnf
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/libdnf
 %py_postclean
 
 install -d $RPM_BUILD_ROOT%{_gtkdocdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir}
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS NEWS README.md docs/release_notes.rst
-%attr(755,root,root) %{_libdir}/libdnf.so.1
-%{_libdir}/girepository-1.0/Dnf-1.0.typelib
+%doc AUTHORS README.md docs/release_notes.rst
+%attr(755,root,root) %{_libdir}/libdnf.so.2
+%dir %{_libdir}/libdnf
+%dir %{_libdir}/libdnf/plugins
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdnf.so
 %{_includedir}/libdnf
-%{_datadir}/gir-1.0/Dnf-1.0.gir
 %{_pkgconfigdir}/libdnf.pc
 
 %if %{with apidocs}
@@ -235,3 +280,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-hawkey-apidocs
 %defattr(644,root,root,755)
 %doc build/docs/hawkey/html/{_static,*.html,*.js}
+
+%files -n python-libdnf
+%defattr(644,root,root,755)
+%{py_sitedir}/libdnf/*.py[co]
+%attr(755,root,root) %{py_sitedir}/libdnf/*.so
+
+%files -n python3-libdnf
+%defattr(644,root,root,755)
+%dir %{py3_sitedir}/libdnf
+%{py3_sitedir}/libdnf/*.py
+%{py3_sitedir}/libdnf/__pycache__
+%attr(755,root,root) %{py3_sitedir}/libdnf/*.so