diff --git a/.gitignore b/.gitignore index 56a1ed7..1541f9b 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /createrepo_c-0.12.2.tar.gz /createrepo_c-0.13.2.tar.gz /createrepo_c-0.14.1.tar.gz +/createrepo_c-0.14.2.tar.gz diff --git a/createrepo_c.spec b/createrepo_c.spec index a96aada..bd4e150 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -1,3 +1,5 @@ +%global libmodulemd_version 2.3.0 + # Bash completion (we need different approach for RHEL-6) %if 0%{?rhel} == 6 %global bash_completion %config%{_sysconfdir}/bash_completion.d/createrepo_c.bash @@ -33,8 +35,8 @@ Summary: Creates a common metadata repository Name: createrepo_c -Version: 0.14.1 -Release: 4%{?dist} +Version: 0.14.2 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/rpm-software-management/createrepo_c Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz @@ -58,9 +60,9 @@ BuildRequires: pkgconfig(zck) >= 0.9.11 BuildRequires: zchunk %endif %if %{with libmodulemd} -BuildRequires: pkgconfig(modulemd-2.0) >= 2.3.0 +BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version} BuildRequires: libmodulemd -Requires: libmodulemd%{?_isa} >= 2.3.0 +Requires: libmodulemd%{?_isa} >= %{libmodulemd_version} %endif Requires: %{name}-libs = %{version}-%{release} %if 0%{?rhel} == 6 @@ -73,7 +75,7 @@ Requires: rpm >= 4.9.0 BuildRequires: drpm-devel >= 0.1.3 %endif -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 Obsoletes: createrepo < 0.11.0 Provides: createrepo = %{version}-%{release} %endif @@ -201,7 +203,7 @@ pushd build-py3 popd %endif -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 +%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 @@ -226,7 +228,7 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %{_bindir}/modifyrepo_c %{_bindir}/sqliterepo_c -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 %{_bindir}/createrepo %{_bindir}/mergerepo %{_bindir}/modifyrepo @@ -257,6 +259,12 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %endif %changelog +* Thu Jun 27 2019 Pavla Kratochvilova - 0.14.2-1 +- Update to 0.14.2 +- 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 + * Mon Jun 10 22:13:18 CET 2019 Igor Gnatenko - 0.14.1-4 - Rebuild for RPM 4.15 diff --git a/sources b/sources index c13ffcb..655af51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (createrepo_c-0.14.1.tar.gz) = 40a7b4c46b7eda4bde8a6082c06e3b5e2ace8c80d288c3d47e431a7f2402a8bf8f4d1ea666dc207f995ace37a134576f0d70fe93e9066374b1ead79abd7622b6 +SHA512 (createrepo_c-0.14.2.tar.gz) = 5d4190ce5edf64d2ed990ebecec6faf4716b6a5d801750f2447fbdcd81c7d76abb548e8f30571926ffdd3f00298b546b695a5e21904118ea95f0916d2cdcc200