Update to 1.7.0
This commit is contained in:
Tomas Mlcoch
parent
624407895e
commit
8ac931fb1b
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,3 +18,4 @@
|
|||||||
/librepo-9106f73.tar.xz
|
/librepo-9106f73.tar.xz
|
||||||
/librepo-8a1bac3.tar.xz
|
/librepo-8a1bac3.tar.xz
|
||||||
/librepo-2b2c02f.tar.xz
|
/librepo-2b2c02f.tar.xz
|
||||||
|
/librepo-4ed3868.tar.xz
|
||||||
|
|||||||
42
librepo.spec
42
librepo.spec
@ -1,8 +1,15 @@
|
|||||||
%global gitrev 2b2c02f
|
%global gitrev 4ed3868
|
||||||
# gitrev is output of: git rev-parse --short HEAD
|
# gitrev is output of: git rev-parse --short HEAD
|
||||||
|
|
||||||
|
%if 0%{?rhel} != 0 && 0%{?rhel} <= 7
|
||||||
|
# Do not build bindings for python3 for RHEL <= 7
|
||||||
|
%bcond_with python3
|
||||||
|
%else
|
||||||
|
%bcond_without python3
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: librepo
|
Name: librepo
|
||||||
Version: 1.6.0
|
Version: 1.7.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Repodata downloading library
|
Summary: Repodata downloading library
|
||||||
|
|
||||||
@ -27,7 +34,9 @@ BuildRequires: openssl-devel
|
|||||||
|
|
||||||
# prevent provides from nonstandard paths:
|
# prevent provides from nonstandard paths:
|
||||||
%filter_provides_in %{python_sitearch}/.*\.so$
|
%filter_provides_in %{python_sitearch}/.*\.so$
|
||||||
|
%if %{with python3}
|
||||||
%filter_provides_in %{python3_sitearch}/.*\.so$
|
%filter_provides_in %{python3_sitearch}/.*\.so$
|
||||||
|
%endif
|
||||||
%filter_setup
|
%filter_setup
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -55,6 +64,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
%description -n python-librepo
|
%description -n python-librepo
|
||||||
Python bindings for the librepo library.
|
Python bindings for the librepo library.
|
||||||
|
|
||||||
|
%if %{with python3}
|
||||||
%package -n python3-librepo
|
%package -n python3-librepo
|
||||||
Summary: Python 3 bindings for the librepo library
|
Summary: Python 3 bindings for the librepo library
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
@ -67,36 +77,45 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
%description -n python3-librepo
|
%description -n python3-librepo
|
||||||
Python 3 bindings for the librepo library.
|
Python 3 bindings for the librepo library.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n librepo
|
%setup -q -n librepo
|
||||||
|
|
||||||
|
%if %{with python3}
|
||||||
rm -rf py3
|
rm -rf py3
|
||||||
mkdir ../py3
|
mkdir ../py3
|
||||||
cp -a . ../py3/
|
cp -a . ../py3/
|
||||||
mv ../py3 ./
|
mv ../py3 ./
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
|
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
%if %{with python3}
|
||||||
pushd py3
|
pushd py3
|
||||||
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPYTHON_DESIRED:str=3 .
|
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPYTHON_DESIRED:str=3 .
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make ARGS="-V" test
|
make ARGS="-V" test
|
||||||
|
|
||||||
|
%if %{with python3}
|
||||||
pushd py3
|
pushd py3
|
||||||
make ARGS="-V" test
|
make ARGS="-V" test
|
||||||
popd
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
%if %{with python3}
|
||||||
pushd py3
|
pushd py3
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
popd
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -114,11 +133,28 @@ popd
|
|||||||
%files -n python-librepo
|
%files -n python-librepo
|
||||||
%{python_sitearch}/librepo/
|
%{python_sitearch}/librepo/
|
||||||
|
|
||||||
|
%if %{with python3}
|
||||||
%files -n python3-librepo
|
%files -n python3-librepo
|
||||||
%{python3_sitearch}/
|
%{python3_sitearch}/
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Feb 20 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 1.6.0-1
|
* Mon Mar 31 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 1.7.0-1
|
||||||
|
- Support for xml:base tag in repomd.xml.
|
||||||
|
- Downloader: If checksums don't match, include the expected values and types
|
||||||
|
in the error message.
|
||||||
|
- Handle: Add LRO_HMFCB and LRI_HMFCB options.
|
||||||
|
- API CHANGE: lr_download_single_cb() new param mfcb (LrMirrorFailureCb)
|
||||||
|
- API CHANGE: Removed cbdata param from lr_download_single_cb(). Use specific
|
||||||
|
data for each target.
|
||||||
|
- New callback LrHandleMirrorFailureCb
|
||||||
|
- Python doc update (Check it out: http://tojaj.github.io/librepo/)
|
||||||
|
|
||||||
|
* Thu Mar 27 2014 Matěj Cepl <mcepl@redhat.com> - 1.6.0-2
|
||||||
|
- Make building of python3 components conditional
|
||||||
|
- replace all TABs with spaces
|
||||||
|
|
||||||
|
* Thu Feb 20 2014 Tomas Mlcoch <tmlcoch at redhat.com> - 1.6.0-1
|
||||||
- Small API change: End callback now must return integer and not void)
|
- Small API change: End callback now must return integer and not void)
|
||||||
- downloader: Check for the lr_interrupt regularly
|
- downloader: Check for the lr_interrupt regularly
|
||||||
- Handle exceptions in python callbacks as return values (RhBug: 1066321)
|
- Handle exceptions in python callbacks as return values (RhBug: 1066321)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user