diff --git a/.gitignore b/.gitignore index f79727a..81ff20b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /createrepo_c-0.11.0.tar.gz /createrepo_c-0.11.1.tar.gz /createrepo_c-0.12.0.tar.gz +/createrepo_c-0.12.1.tar.gz diff --git a/createrepo_c.spec b/createrepo_c.spec index 9b1f66c..b5a6eb7 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -19,7 +19,7 @@ %bcond_without python2 %endif -%if 0%{?rhel} || 0%{?fedora} <= 29 +%if 0%{?rhel} || 0%{?fedora} < 29 %bcond_with zchunk %else %bcond_without zchunk @@ -27,8 +27,8 @@ Summary: Creates a common metadata repository Name: createrepo_c -Version: 0.12.0 -Release: 2%{?dist} +Version: 0.12.1 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/rpm-software-management/createrepo_c Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz @@ -91,7 +91,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} @@ -125,7 +129,7 @@ mkdir build-py3 # Build createrepo_c with Python 2 %if %{with python2} pushd build-py2 - %cmake .. -DPYTHON_DESIRED:str=2 %{!?with_zchunk:-DWITH_ZCHUNK=OFF} + %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python2} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" %if %{without python3} # Build C documentation @@ -137,7 +141,7 @@ popd # Build createrepo_c with Pyhon 3 %if %{with python3} pushd build-py3 - %cmake .. -DPYTHON_DESIRED:str=3 %{!?with_zchunk:-DWITH_ZCHUNK=OFF} + %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" # Build C documentation make doc-c @@ -234,6 +238,11 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo %endif %changelog +* Wed Feb 13 2019 Pavla Kratochvilova - 0.12.1-1 +- Update to 0.12.1-1 +- Include file timestamp in repomd.xml to allow reproducing exact metadata as produced in the past +- Enhance support of zchunk + * Thu Jan 31 2019 Fedora Release Engineering - 0.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 96e2c7c..f5acddb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (createrepo_c-0.12.0.tar.gz) = ac8a8b289092b9fd882e0f8f7885d5ed18289d2b2c1886918f81e85e63db7116a4b0e28492928445d5da8ac7834cbb769f72cfcc64f5635e71868de9ca030b08 +SHA512 (createrepo_c-0.12.1.tar.gz) = 822a6b0a45a1646c318f7cb943e09db9cb0287d06fa6a9cf100a0f5221ecf4ebd0d002f8f6f346ce14247419a45350bae8b44693d18023e83c30df1154df1906