From a621a5e28950aee52968cc618f3870f914423fd6 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Tue, 4 Oct 2016 21:41:23 +1000
Subject: [PATCH] New version 0.24.1 New library major 24 Spec cleanup

---
 .abf.yml                     |  2 +-
 libgit2-0.19.0-non-x86.patch | 14 --------
 libgit2.spec                 | 65 +++++++++++++++++-------------------
 3 files changed, 31 insertions(+), 50 deletions(-)
 delete mode 100644 libgit2-0.19.0-non-x86.patch

diff --git a/.abf.yml b/.abf.yml
index 419da95..abe8e67 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  libgit2-0.22.2.tar.gz: 877d02a1b6b8d5d7dd73e10d251f5a2ef35df81b
+  libgit2-0.24.1.tar.gz: 198ac53d713c521d940951ab5d6b90b75b941918
diff --git a/libgit2-0.19.0-non-x86.patch b/libgit2-0.19.0-non-x86.patch
deleted file mode 100644
index 4067b52..0000000
--- a/libgit2-0.19.0-non-x86.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up libgit2-0.18.0/src/bswap.h.non-x86 libgit2-0.18.0/src/bswap.h
---- libgit2-0.18.0/src/bswap.h.non-x86	2013-06-19 10:01:31.000000000 +0200
-+++ libgit2-0.18.0/src/bswap.h	2013-06-19 10:01:50.000000000 +0200
-@@ -76,6 +76,10 @@ GIT_INLINE(uint16_t) default_swab16(uint
- #define bswap32(x) _byteswap_ulong(x)
- #define bswap16(x) _byteswap_ushort(x)
- 
-+#else
-+
-+#include <arpa/inet.h>
-+
- #endif
- 
- #ifdef bswap32
diff --git a/libgit2.spec b/libgit2.spec
index 151fa6c..6153b11 100644
--- a/libgit2.spec
+++ b/libgit2.spec
@@ -1,30 +1,20 @@
-%define major	22
+%define major 24
 %define libname %mklibname git2_ %{major}
-%define devname %mklibname -d git2
+%define devname %mklibname git2 -d
 
-Name:		libgit2
-Version:	0.22.2
-Release:	2
 Summary:	A C implementation of the Git core methods as a library
-Group:		System/Libraries
+Name:		libgit2
+Version:	0.24.1
+Release:	1
 License:	GPLv2 with exceptions
-URL:		http://libgit2.github.com/
+Group:		System/Libraries
+Url:		http://libgit2.github.com/
 Source0:	https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz
-
-# Use system libxdiff
-#Patch0: libgit2-0.19.0-system-libxdiff.patch
-
-# Add htonl() and friends declarations on non-x86 arches
-Patch1:		libgit2-0.19.0-non-x86.patch
-
-#Patch2:  libgit2-build-fix.diff
-
-BuildRequires:	cmake >= 2.6
+BuildRequires:	cmake
 BuildRequires:	http-parser-devel
-BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig(libssh2)
-BuildRequires:	python
-BuildRequires:	zlib-devel
+BuildRequires:	pkgconfig(openssl)
+BuildRequires:	pkgconfig(zlib)
 
 %description
 libgit2 is a portable, pure C implementation of the Git core methods
@@ -32,6 +22,8 @@ provided as a re-entrant linkable library with a solid API, allowing
 you to write native speed custom Git applications in any language
 with bindings.
 
+#----------------------------------------------------------------------------
+
 %package -n %{libname}
 Summary:	A C implementation of the Git core methods as a library
 Group:		System/Libraries
@@ -42,15 +34,30 @@ provided as a re-entrant linkable library with a solid API, allowing
 you to write native speed custom Git applications in any language
 with bindings.
 
+%files -n %{libname}
+%doc README.md COPYING AUTHORS
+%{_libdir}/libgit2.so.%{major}
+%{_libdir}/libgit2.so.0.%{major}.*
+
+#----------------------------------------------------------------------------
+
 %package -n %{devname}
 Summary:	Development files for %{name}
 Group:		Development/C
-Requires:	%{libname} = %{version}-%{release}
+Requires:	%{libname} = %{EVRD}
 
 %description -n %{devname}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%files -n %{devname}
+%doc docs examples
+%{_libdir}/libgit2.so
+%{_libdir}/pkgconfig/libgit2.pc
+%{_includedir}/git2*
+
+#----------------------------------------------------------------------------
+
 %prep
 %setup -q
 %apply_patches
@@ -74,20 +81,8 @@ rm -rf deps
 	-DUSE_SSH:BOOL=ON
 %make
 
-%check
-ctest -V
-
 %install
 %makeinstall_std -C build
 
-%files -n %{libname}
-%doc README.md COPYING AUTHORS
-%{_libdir}/libgit2.so.%{major}
-%{_libdir}/libgit2.so.0.%{major}.*
-
-%files -n %{devname}
-%doc docs examples
-%{_libdir}/libgit2.so
-%{_libdir}/pkgconfig/libgit2.pc
-%{_includedir}/git2*
-
+%check
+ctest -V