rpms/librepo
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.7.0

Browse Source
This commit is contained in:
Tomas Mlcoch 2014-03-31 13:07:51 +02:00
parent 624407895e
commit 8ac931fb1b
3 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

96
librepo.spec
View File

@ -1,33 +1,42 @@
%global gitrev 2b2c02f %global gitrev 4ed3868
# gitrev is output of: git rev-parse --short HEAD # gitrev is output of: git rev-parse --short HEAD
Name: librepo %if 0%{?rhel} != 0 && 0%{?rhel} <= 7
Version: 1.6.0 # Do not build bindings for python3 for RHEL <= 7
Release: 1%{?dist} %bcond_with python3
Summary: Repodata downloading library %else
%bcond_without python3
%endif
Group: System Environment/Libraries Name: librepo
License: GPLv2+ Version: 1.7.0
URL: https://github.com/Tojaj/librepo Release: 1%{?dist}
Summary: Repodata downloading library
Group: System Environment/Libraries
License: GPLv2+
URL: https://github.com/Tojaj/librepo
# Use the following commands to generate the tarball: # Use the following commands to generate the tarball:
# git clone https://github.com/Tojaj/librepo.git # git clone https://github.com/Tojaj/librepo.git
# cd librepo # cd librepo
# utils/make_tarball.sh %{gitrev} # utils/make_tarball.sh %{gitrev}
Source0: librepo-%{gitrev}.tar.xz Source0: librepo-%{gitrev}.tar.xz
BuildRequires: check-devel BuildRequires: check-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: glib2-devel >= 2.22.0 BuildRequires: glib2-devel >= 2.22.0
BuildRequires: gpgme-devel BuildRequires: gpgme-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: openssl-devel 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
@ -35,30 +44,31 @@ A library providing C and Python (libcURL like) API to downloading repository
metadata. metadata.
%package devel %package devel
Summary: Repodata downloading library Summary: Repodata downloading library
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
Development files for librepo. Development files for librepo.
%package -n python-librepo %package -n python-librepo
Summary: Python bindings for the librepo library Summary: Python bindings for the librepo library
Group: Development/Languages Group: Development/Languages
BuildRequires: pygpgme BuildRequires: pygpgme
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python-flask BuildRequires: python-flask
BuildRequires: python-nose BuildRequires: python-nose
BuildRequires: python-sphinx BuildRequires: python-sphinx
Requires: %{name}%{?_isa} = %{version}-%{release} 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
BuildRequires: python3-pygpgme BuildRequires: python3-pygpgme
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-flask BuildRequires: python3-flask
BuildRequires: python3-nose BuildRequires: python3-nose
@ -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)

2
sources
View File

@ -1 +1 @@
45d6cd4ffeffdc9eb73185c1f5a06615 librepo-2b2c02f.tar.xz 94bd6631a620c48c2ec3f1346a9e6c9c librepo-4ed3868.tar.xz