[libgit2] 0.19.0

[Veeti Paananen]

commit fe4e3498f902d10d5d9258b8fab0fb272f22cc8a
Author: Veeti Paananen <veeti.paananen at rojekti.fi>
Date:   Tue Jun 25 01:31:27 2013 +0300

    0.19.0

 .gitignore                                         |    1 +
 libgit2-0.18.0-http.patch                          |   92 --------------------
 libgit2-0.18.0-system-libxdiff.patch               |   26 ------
 ...0-non-x86.patch => libgit2-0.19.0-non-x86.patch |    0
 libgit2-0.19.0-system-libxdiff.patch               |   29 ++++++
 libgit2.spec                                       |   19 ++--
 sources                                            |    2 +-
 7 files changed, 40 insertions(+), 129 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 468dd06..7c345ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /v0.18.0.tar.gz
+/v0.19.0.tar.gz
diff --git a/libgit2-0.18.0-non-x86.patch b/libgit2-0.19.0-non-x86.patch
similarity index 100%
rename from libgit2-0.18.0-non-x86.patch
rename to libgit2-0.19.0-non-x86.patch
diff --git a/libgit2-0.19.0-system-libxdiff.patch b/libgit2-0.19.0-system-libxdiff.patch
new file mode 100644
index 0000000..488da47
--- /dev/null
+++ b/libgit2-0.19.0-system-libxdiff.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b931dc5..2aa8fde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -298,7 +298,7 @@ ELSEIF (AMIGA)
+ ELSE()
+ 	FILE(GLOB SRC_OS src/unix/*.c)
+ ENDIF()
+-FILE(GLOB SRC_GIT2 src/*.c src/transports/*.c src/xdiff/*.c)
++FILE(GLOB SRC_GIT2 src/*.c src/transports/*.c)
+ 
+ # Determine architecture of the machine
+ IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+@@ -313,6 +313,7 @@ ENDIF()
+ ADD_LIBRARY(git2 ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1} ${WIN_RC})
+ TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES})
+ TARGET_LINK_LIBRARIES(git2 ${SSH_LIBRARIES})
++TARGET_LINK_LIBRARIES(git2 -lxdiff)
+ TARGET_OS_LIBRARIES(git2)
+ 
+ # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
+@@ -388,6 +389,7 @@ IF (BUILD_CLAR)
+ 
+ 	TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES})
+ 	TARGET_LINK_LIBRARIES(libgit2_clar ${SSH_LIBRARIES})
++	TARGET_LINK_LIBRARIES(libgit2_clar -lxdiff)
+ 	TARGET_OS_LIBRARIES(libgit2_clar)
+ 	MSVC_SPLIT_SOURCES(libgit2_clar)
+ 
diff --git a/libgit2.spec b/libgit2.spec
index 62bbdaa..a5211b7 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -1,20 +1,17 @@
 Name: libgit2
-Version: 0.18.0
-Release: 5%{?dist}
+Version: 0.19.0
+Release: 1%{?dist}
 Summary: A C implementation of the Git core methods as a library
 
 License: GPLv2 with exceptions
 URL: http://libgit2.github.com/
 Source0: https://github.com/libgit2/libgit2/archive/v%{version}.tar.gz
 
-# Remove bundling of http-parser
-Patch0: libgit2-0.18.0-http.patch
-
 # Use system libxdiff
-Patch1: libgit2-0.18.0-system-libxdiff.patch
+Patch0: libgit2-0.19.0-system-libxdiff.patch
 
 # Add htonl() and friends declarations on non-x86 arches
-Patch2: libgit2-0.18.0-non-x86.patch
+Patch1: libgit2-0.19.0-non-x86.patch
 
 BuildRequires: cmake >= 2.6
 BuildRequires: http-parser-devel
@@ -45,9 +42,8 @@ developing applications that use %{name}.
 find examples -name ".gitignore" -delete
 
 # Apply patches
-%patch0 -p1
-%patch1 -p1 -b .system-libxdiff
-%patch2 -p1 -b .non-x86
+%patch0 -p1 -b .system-libxdiff
+%patch1 -p1 -b .non-x86
 
 # Fix pkgconfig generation
 sed -i 's|@CMAKE_INSTALL_PREFIX@/||' libgit2.pc.in
@@ -90,6 +86,9 @@ make install DESTDIR=%{buildroot}
 
 
 %changelog
+* Tue Jun 25 2013 Veeti Paananen <veeti.paananen at rojekti.fi> - 0.19.0-1
+- 0.19.0
+
 * Wed Jun 19 2013 Dan Horák <dan[at]danny.cz> - 0.18.0-5
 - Add htonl() and friends declarations on non-x86 arches
 - Rebuilt with fixed libxdiff for big endian arches
diff --git a/sources b/sources
index 6f01d57..1667e38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce6845df0dd084ef2633a69dba64929c  v0.18.0.tar.gz
+d682d9424d95f697bf3f89b358fe8e1a  v0.19.0.tar.gz