From 04ff1d7f3ff953a799fd937ee3f4041270cd82c6 Mon Sep 17 00:00:00 2001 From: Pavla Kratochvilova Date: Tue, 7 May 2019 12:03:27 +0200 Subject: [PATCH] Update to 0.13.2 --- .gitignore | 1 + createrepo_c.spec | 36 ++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 508d9e9..a960d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /createrepo_c-0.12.0.tar.gz /createrepo_c-0.12.1.tar.gz /createrepo_c-0.12.2.tar.gz +/createrepo_c-0.13.2.tar.gz diff --git a/createrepo_c.spec b/createrepo_c.spec index c5e8e68..27b2b62 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -25,9 +25,15 @@ %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.12.2 +Version: 0.13.2 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/rpm-software-management/createrepo_c @@ -51,6 +57,10 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(zck) >= 0.9.11 BuildRequires: zchunk %endif +%if %{with libmodulemd} +BuildRequires: pkgconfig(modulemd-2.0) >= 2.3.0 +BuildRequires: libmodulemd +%endif Requires: %{name}-libs = %{version}-%{release} %if 0%{?rhel} == 6 Requires: rpm >= 4.8.0-28 @@ -61,8 +71,11 @@ Requires: rpm >= 4.9.0 %if %{with drpm} BuildRequires: drpm-devel >= 0.1.3 %endif + +%if 0%{?fedora} > 30 || 0%{?rhel} > 7 Obsoletes: createrepo < 0.11.0 Provides: createrepo = %{version}-%{release} +%endif %description C implementation of Createrepo. @@ -129,7 +142,7 @@ mkdir build-py3 # Build createrepo_c with Python 2 %if %{with python2} pushd build-py2 - %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python2} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} + %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 @@ -141,7 +154,7 @@ popd # Build createrepo_c with Pyhon 3 %if %{with python3} pushd build-py3 - %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} + %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 @@ -187,9 +200,11 @@ pushd build-py3 popd %endif +%if 0%{?fedora} > 30 || 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 @@ -208,10 +223,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} > 30 || 0%{?rhel} > 7 %{_bindir}/createrepo %{_bindir}/mergerepo %{_bindir}/modifyrepo -%{_bindir}/sqliterepo_c +%endif %files libs %license COPYING @@ -238,6 +256,16 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %endif %changelog +* Tue May 07 2019 Pavla Kratochvilova - 0.13.2-1 +- Update to 0.13.2 +- Add support for reading and merging module metadata +- Add support for modular errata (RhBug:1656584) +- 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) +- modifyrepo_c: Prevent doubling of compression suffix (test.gz.gz) +- Do not obsolete createrepo on Fedora < 31 + * Mon Mar 11 2019 Pavla Kratochvilova - 0.12.2-1 - Update to 0.12.2 - mergerepo_c: check if nevra is NULL and warn user about src.rpm naming diff --git a/sources b/sources index a0c1cef..877dcfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (createrepo_c-0.12.2.tar.gz) = f1b1341f1e4bded6551d6fd9c086930db27a0286148ff1ddf3f9654d59417b17e83f1dfe5fb3272a44854a0dfcd8eae9d9473409bafb0052f4e3382997a799e8 +SHA512 (createrepo_c-0.13.2.tar.gz) = 071372d8df02d5a103c00e9ec99a1e4482337afdf49fe17f7643293060fe8b794d2efd12992f3afef281ad796ed21b3c6dd3a610cdd4ea229a45a7b482764201