diff --git a/.createrepo_c.metadata b/.createrepo_c.metadata
index 5f0bcc7..3341249 100644
--- a/.createrepo_c.metadata
+++ b/.createrepo_c.metadata
@@ -1 +1 @@
-60f5c59be623b10b8a7282d251c496cd49083268 SOURCES/createrepo_c-0.11.0.tar.gz
+e85178e66ca8c2157ef2da31cb8c25ff456631fd SOURCES/createrepo_c-0.15.1.tar.gz
diff --git a/.gitignore b/.gitignore
index 7b723f4..81a3d81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/createrepo_c-0.11.0.tar.gz
+SOURCES/createrepo_c-0.15.1.tar.gz
diff --git a/SPECS/createrepo_c.spec b/SPECS/createrepo_c.spec
index c664178..1816417 100644
--- a/SPECS/createrepo_c.spec
+++ b/SPECS/createrepo_c.spec
@@ -1,3 +1,4 @@
+%global libmodulemd_version 2.3.0
%{!?_licensedir:%global license %%doc}
# Bash completion (we need different approach for RHEL-6)
@@ -7,8 +8,6 @@
%global bash_completion %{_datadir}/bash-completion/completions/*
%endif
-%{!?python2_sitearch:%global python2_sitearch %{python_sitearch}}
-
%if 0%{?rhel} && 0%{?rhel} <= 7
%bcond_with python3
%bcond_with drpm
@@ -17,15 +16,27 @@
%bcond_without drpm
%endif
-%if 0%{?rhel} > 7
+%if 0%{?fedora} > 29 || 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
%endif
+%if 0%{?rhel} || 0%{?fedora} < 29
+%bcond_with zchunk
+%else
+%bcond_without zchunk
+%endif
+
+%if 0%{?rhel} || 0%{?fedora} < 29
+%bcond_with libmodulemd
+%else
+%bcond_without libmodulemd
+%endif
+
Summary: Creates a common metadata repository
Name: createrepo_c
-Version: 0.11.0
+Version: 0.15.1
Release: 1%{?dist}
License: GPLv2+
URL: https://github.com/rpm-software-management/createrepo_c
@@ -45,6 +56,15 @@ BuildRequires: rpm-devel >= 4.8.0-28
BuildRequires: sqlite-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
+%if %{with zchunk}
+BuildRequires: pkgconfig(zck) >= 0.9.11
+BuildRequires: zchunk
+%endif
+%if %{with libmodulemd}
+BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
+BuildRequires: libmodulemd
+Requires: libmodulemd%{?_isa} >= %{libmodulemd_version}
+%endif
Requires: %{name}-libs = %{version}-%{release}
%if 0%{?rhel} == 6
Requires: rpm >= 4.8.0-28
@@ -53,10 +73,13 @@ BuildRequires: bash-completion
Requires: rpm >= 4.9.0
%endif
%if %{with drpm}
-BuildRequires: drpm-devel >= 0.1.3
+BuildRequires: drpm-devel >= 0.4.0
%endif
+
+%if 0%{?fedora} || 0%{?rhel} > 7
Obsoletes: createrepo < 0.11.0
Provides: createrepo = %{version}-%{release}
+%endif
%description
C implementation of Createrepo.
@@ -85,7 +108,11 @@ Summary: Python bindings for the createrepo_c library
%{?python_provide:%python_provide python2-%{name}}
BuildRequires: python2-devel
BuildRequires: python2-nose
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: python-sphinx
+%else
BuildRequires: python2-sphinx
+%endif
Requires: %{name}-libs = %{version}-%{release}
%description -n python2-%{name}
@@ -119,7 +146,7 @@ mkdir build-py3
# Build createrepo_c with Python 2
%if %{with python2}
pushd build-py2
- %cmake ../
+ %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python2} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_libmodulemd:-DWITH_LIBMODULEMD=OFF}
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
%if %{without python3}
# Build C documentation
@@ -131,7 +158,7 @@ popd
# Build createrepo_c with Pyhon 3
%if %{with python3}
pushd build-py3
- %cmake ../ -DPYTHON_DESIRED:str=3
+ %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_libmodulemd:-DWITH_LIBMODULEMD=OFF}
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
# Build C documentation
make doc-c
@@ -177,11 +204,18 @@ pushd build-py3
popd
%endif
+%if 0%{?fedora} || 0%{?rhel} > 7
ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo
ln -sr %{buildroot}%{_bindir}/mergerepo_c %{buildroot}%{_bindir}/mergerepo
ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%else
%ldconfig_scriptlets libs
+%endif
%files
%doc README.md
@@ -193,10 +227,13 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
%{_bindir}/createrepo_c
%{_bindir}/mergerepo_c
%{_bindir}/modifyrepo_c
+%{_bindir}/sqliterepo_c
+
+%if 0%{?fedora} || 0%{?rhel} > 7
%{_bindir}/createrepo
%{_bindir}/mergerepo
%{_bindir}/modifyrepo
-%{_bindir}/sqliterepo_c
+%endif
%files libs
%license COPYING
@@ -215,14 +252,53 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
%if %{with python2}
%files -n python2-%{name}
%{python2_sitearch}/%{name}/
+%{python2_sitearch}/%{name}-%{version}-py%{python2_version}.egg-info
%endif
%if %{with python3}
%files -n python3-%{name}
%{python3_sitearch}/%{name}/
+%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
%endif
%changelog
+* Tue Oct 22 2019 Ales Matej <amatej@redhat.com> - 0.15.1-1
+- Update to 0.15.1
+- Allow pip to see installation of python3-createrepo_c
+- Imporove documentation
+- Remove dependency on deltarpm in favour of drpm
+- Obsolete createrepo on all Fedoras again (RhBug:1702771)
+- Fix issue with createrepo_c hanging at the end (RhBug:1714666)
+- Don't include packages with forbidden control chars in repodata
+- Depend on the appropriate minimum version of libmodulemd
+- Add --pkgorigins mode for Koji
+- Prevent exiting with 0 if errors occur while finalizing repodata.
+- Add support for reading and merging module metadata
+- Update --keep-all-metadata to keep all additional metadata, not just updateinfo and groupfile (RhBug:1639287)
+- mergerepo_c: Add support for --koji simple mode
+- Fix generating corrupted sqlite files (RhBug: 1696808)
+- Do not obsolete createrepo on Fedora < 31
+- mergerepo_c: check if nevra is NULL and warn user about src.rpm naming
+- Include file timestamp in repomd.xml to allow reproducing exact metadata as produced in the past
+- Enhance support of zchunk
+- Support of zchunk
+- [spec] Fix ldconfig for rhel <= 7
+- Fix "CR_DELTA_RPM_SUPPORT" redefined warnings
+- Set to build against Python 3 by default
+- Update README
+- Add mergerepo_c --repo-prefix-search and --repo-prefix-replace.
+- Fix missing packages in mergerepo_c in case multiple VR exists for single pkg in repo.
+
+* Thu Aug 08 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.11.0-3
+- Backport patch to switch off timestamps on documentation in order to remove
+ file conflicts (RhBug:1738788)
+
+* Mon Jul 22 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.11.0-2
+- Consistently produce valid URLs by prepending protocol. (RhBug:1632121)
+- modifyrepo_c: Prevent doubling of compression (test.gz.gz) (RhBug:1639287)
+- Correct pkg count in headers if there were invalid pkgs (RhBug:1596211)
+- Add support for modular errata (RhBug:1656584)
+
* Wed Jun 27 2018 Marek Blaha <mblaha@redhat.com> - 0.11.0-1
- Update to 0.11.0