Build with the bundled xdiff

Unfortunately, building against the system libxdiff doesn't work at the
moment, because libxdiff got updated but libgit2 hasn't been ported yet.

While we're waiting for the bundling issue to be fixed upstream, let's
build against the bundled copy for now.
This commit is contained in:
Mathieu Bridon 2014-03-25 21:22:26 +08:00 committed by Ignacio Casal Quinteiro
parent 198c08ad9e
commit 490c5ad17a

View File

@ -9,19 +9,17 @@ License: GPLv2 with exceptions
URL: http://libgit2.github.com/
Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}.tar.gz
# Use system libxdiff
Patch0: libgit2-0.20.0-system-libxdiff.patch
# Add htonl() and friends declarations on non-x86 arches
Patch1: libgit2-0.19.0-non-x86.patch
BuildRequires: cmake >= 2.6
BuildRequires: http-parser-devel
BuildRequires: libxdiff-devel
BuildRequires: openssl-devel
BuildRequires: python
BuildRequires: zlib-devel
Provides: bundled(libxdiff)
%description
libgit2 is a portable, pure C implementation of the Git core methods
provided as a re-entrant linkable library with a solid API, allowing
@ -44,7 +42,6 @@ developing applications that use %{name}.
find examples -name ".gitignore" -delete
# Apply patches
%patch0 -p1 -b .system-libxdiff
%patch1 -p1 -b .non-x86
# Fix pkgconfig generation
@ -55,7 +52,6 @@ sed -i 's/ionline/xonline/' CMakeLists.txt
# Remove bundled libraries
rm -rf deps
rm -rf src/xdiff
%build
@ -88,6 +84,8 @@ make install DESTDIR=%{buildroot}
%changelog
- Build with the bundled xdiff.
* Sun Nov 24 2013 Ignacio Casal Quinteiro <icq@gnome.org> - 0.20.0-1
- 0.20.0