Update to 0.17.2
This commit is contained in:
parent
30bccbf441
commit
fa6d0ebeb4
@ -2,27 +2,14 @@
|
|||||||
|
|
||||||
%define __cmake_in_source_build 1
|
%define __cmake_in_source_build 1
|
||||||
|
|
||||||
# Bash completion (we need different approach for RHEL-6)
|
|
||||||
%if 0%{?rhel} == 6
|
|
||||||
%global bash_completion %config%{_sysconfdir}/bash_completion.d/createrepo_c.bash
|
|
||||||
%else
|
|
||||||
%global bash_completion %{_datadir}/bash-completion/completions/*
|
%global bash_completion %{_datadir}/bash-completion/completions/*
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
%if 0%{?rhel} && ( 0%{?rhel} <= 7 || 0%{?rhel} >= 9 )
|
||||||
%bcond_with python3
|
|
||||||
%bcond_with drpm
|
%bcond_with drpm
|
||||||
%else
|
%else
|
||||||
%bcond_without python3
|
|
||||||
%bcond_without drpm
|
%bcond_without drpm
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} > 29 || 0%{?rhel} > 7
|
|
||||||
%bcond_with python2
|
|
||||||
%else
|
|
||||||
%bcond_without python2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?rhel} || 0%{?fedora} < 29
|
%if 0%{?rhel} || 0%{?fedora} < 29
|
||||||
%bcond_with zchunk
|
%bcond_with zchunk
|
||||||
%else
|
%else
|
||||||
@ -37,8 +24,8 @@
|
|||||||
|
|
||||||
Summary: Creates a common metadata repository
|
Summary: Creates a common metadata repository
|
||||||
Name: createrepo_c
|
Name: createrepo_c
|
||||||
Version: 0.16.2
|
Version: 0.17.2
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/rpm-software-management/createrepo_c
|
URL: https://github.com/rpm-software-management/createrepo_c
|
||||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
@ -54,6 +41,7 @@ BuildRequires: libxml2-devel
|
|||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: rpm-devel >= 4.8.0-28
|
BuildRequires: rpm-devel >= 4.8.0-28
|
||||||
BuildRequires: sqlite-devel
|
BuildRequires: sqlite-devel
|
||||||
|
BuildRequires: xz
|
||||||
BuildRequires: xz-devel
|
BuildRequires: xz-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%if %{with zchunk}
|
%if %{with zchunk}
|
||||||
@ -66,12 +54,8 @@ BuildRequires: libmodulemd
|
|||||||
Requires: libmodulemd%{?_isa} >= %{libmodulemd_version}
|
Requires: libmodulemd%{?_isa} >= %{libmodulemd_version}
|
||||||
%endif
|
%endif
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
%if 0%{?rhel} == 6
|
|
||||||
Requires: rpm >= 4.8.0-28
|
|
||||||
%else
|
|
||||||
BuildRequires: bash-completion
|
BuildRequires: bash-completion
|
||||||
Requires: rpm >= 4.9.0
|
Requires: rpm >= 4.9.0
|
||||||
%endif
|
|
||||||
%if %{with drpm}
|
%if %{with drpm}
|
||||||
BuildRequires: drpm-devel >= 0.4.0
|
BuildRequires: drpm-devel >= 0.4.0
|
||||||
%endif
|
%endif
|
||||||
@ -102,85 +86,35 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
|||||||
This package contains the createrepo_c C library and header files.
|
This package contains the createrepo_c C library and header files.
|
||||||
These development files are for easy manipulation with a repodata.
|
These development files are for easy manipulation with a repodata.
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%package -n python2-%{name}
|
|
||||||
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}
|
|
||||||
Python bindings for the createrepo_c library.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
Summary: Python 3 bindings for the createrepo_c library
|
Summary: Python 3 bindings for the createrepo_c library
|
||||||
%{?python_provide:%python_provide python3-%{name}}
|
%{?python_provide:%python_provide python3-%{name}}
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-nose
|
|
||||||
BuildRequires: python3-sphinx
|
BuildRequires: python3-sphinx
|
||||||
BuildRequires: make
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
|
||||||
%description -n python3-%{name}
|
%description -n python3-%{name}
|
||||||
Python 3 bindings for the createrepo_c library.
|
Python 3 bindings for the createrepo_c library.
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
%if %{with python2}
|
|
||||||
mkdir build-py2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
mkdir build-py3
|
mkdir build-py3
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Build createrepo_c with Python 2
|
|
||||||
%if %{with python2}
|
|
||||||
pushd build-py2
|
|
||||||
%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
|
|
||||||
make doc-c
|
|
||||||
%endif
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Build createrepo_c with Pyhon 3
|
# Build createrepo_c with Pyhon 3
|
||||||
%if %{with python3}
|
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
%cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_libmodulemd:-DWITH_LIBMODULEMD=OFF}
|
%cmake .. \
|
||||||
|
-DWITH_ZCHUNK=%{?with_zchunk:ON}%{!?with_zchunk:OFF} \
|
||||||
|
-DWITH_LIBMODULEMD=%{?with_libmodulemd:ON}%{!?with_libmodulemd:OFF} \
|
||||||
|
-DENABLE_DRPM=%{?with_drpm:ON}%{!?with_drpm:OFF}
|
||||||
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
|
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
|
||||||
# Build C documentation
|
# Build C documentation
|
||||||
make doc-c
|
make doc-c
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{with python2}
|
|
||||||
pushd build-py2
|
|
||||||
%if %{without python3}
|
|
||||||
# Compile C tests
|
|
||||||
make tests
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Run Python 2 tests
|
|
||||||
make ARGS="-V" test
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Run Python 3 tests
|
# Run Python 3 tests
|
||||||
%if %{with python3}
|
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
# Compile C tests
|
# Compile C tests
|
||||||
make tests
|
make tests
|
||||||
@ -188,22 +122,12 @@ pushd build-py3
|
|||||||
# Run Python 3 tests
|
# Run Python 3 tests
|
||||||
make ARGS="-V" test
|
make ARGS="-V" test
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if %{with python2}
|
|
||||||
pushd build-py2
|
|
||||||
# Install createrepo_c with Python 2
|
|
||||||
make install DESTDIR=%{buildroot}
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
|
||||||
pushd build-py3
|
pushd build-py3
|
||||||
# Install createrepo_c with Python 3
|
# Install createrepo_c with Python 3
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
popd
|
popd
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo
|
ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo
|
||||||
@ -241,28 +165,28 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
|
|||||||
%{_libdir}/lib%{name}.so.*
|
%{_libdir}/lib%{name}.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%if %{with python3}
|
|
||||||
%doc build-py3/doc/html
|
%doc build-py3/doc/html
|
||||||
%else
|
|
||||||
%doc build-py2/doc/html
|
|
||||||
%endif
|
|
||||||
%{_libdir}/lib%{name}.so
|
%{_libdir}/lib%{name}.so
|
||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
%{_includedir}/%{name}/
|
%{_includedir}/%{name}/
|
||||||
|
|
||||||
%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}
|
%files -n python3-%{name}
|
||||||
%{python3_sitearch}/%{name}/
|
%{python3_sitearch}/%{name}/
|
||||||
%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
|
%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 15 2021 Nicola Sella <nsella@redhat.com> - 0.17.2-1
|
||||||
|
- Update to 0.17.2
|
||||||
|
- Remove empty arrays in tests, pass NULL instead (fixes a compiler war…
|
||||||
|
- Replace 'blacklist' with 'excludelist'
|
||||||
|
- Allow taking __repr__ (__str__) of closed xmlfile and sqlite (RhBug:1913465)
|
||||||
|
- Fix segmentation fault when taking str() of closed file
|
||||||
|
- Setting updated/issued_date to None - (RhBug:1921715)
|
||||||
|
- Drop Python 2 support
|
||||||
|
- Disable drpm also for RHEL >= 9 (RhBug:1914828)
|
||||||
|
- Never leave behind .repodata lock on exit (RhBug:1906831)
|
||||||
|
- Revert back to old API of cr_compress_file_with_stat and cr_compress
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.2-2
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.2-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (createrepo_c-0.16.2.tar.gz) = c63abc8aa6c65584b51a0aa337e261fe5d9a52d72287874f86531caa8133718290a4f44aa765979fa319973c4ba0681437a26f84f64bd5bf781c86a6daa8a39b
|
SHA512 (createrepo_c-0.17.2.tar.gz) = 500315c1d099766c5c83bb1f18a92c97c49ed30d2632fe08f9d0c3faefd2afcdf2ed73e08ad675504ff59bc7ed7a4f95e9e80816940959a83ae7b25a12c28dce
|
||||||
|
Loading…
Reference in New Issue
Block a user