diff --git a/.abf.yml b/.abf.yml index 2a38c6f..70bdc36 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,2 @@ -removed_sources: - libgit2-0.24.1.tar.gz: 198ac53d713c521d940951ab5d6b90b75b941918 sources: - libgit2-0.26.0.tar.gz: 7e9792e3d2ee88719f0d7cb59737256bfc1cddbb + libgit2-1.4.2.tar.gz: 2b12cbf784a753f0cb44a728002aa0191072af43 diff --git a/libgit2.spec b/libgit2.spec index ae501c3..c77bd0a 100644 --- a/libgit2.spec +++ b/libgit2.spec @@ -1,17 +1,18 @@ -%define major 26 +%define major 1.4 %define libname %mklibname git2_ %{major} %define devname %mklibname git2 -d Summary: A C implementation of the Git core methods as a library Name: libgit2 -Version: 0.26.0 -Release: 4 +Version: 1.4.2 +Release: 1 License: GPLv2 with exceptions Group: System/Libraries Url: http://libgit2.github.com/ Source0: https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: http-parser-devel +BuildRequires: pkgconfig(krb5-gssapi) +BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) @@ -37,7 +38,7 @@ with bindings. %files -n %{libname} %doc README.md COPYING AUTHORS %{_libdir}/libgit2.so.%{major} -%{_libdir}/libgit2.so.0.%{major}.* +%{_libdir}/libgit2.so.%{major}.* #---------------------------------------------------------------------------- @@ -51,7 +52,8 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %files -n %{devname} -%doc docs examples +%doc AUTHORS docs examples README.md SECURITY.md +%license COPYING %{_libdir}/libgit2.so %{_libdir}/pkgconfig/libgit2.pc %{_includedir}/git2* @@ -59,26 +61,19 @@ developing applications that use %{name}. #---------------------------------------------------------------------------- %prep -%setup -q -%apply_patches +%autosetup -p1 # Remove VCS files from examples find examples -name ".gitignore" -delete -# Fix pkgconfig generation -sed -i 's|@CMAKE_INSTALL_PREFIX@/||' libgit2.pc.in - -# Don't test network -sed -i 's/ionline/xonline/' CMakeLists.txt - -# Remove bundled libraries -rm -rf deps +# Remove some bundled libraries +rm -rf deps/{chromium-zlib,pcre,winhttp,zlib} #rm -rf src/xdiff %build %cmake \ - -DTHREADSAFE:BOOL=ON \ - -DUSE_SSH:BOOL=ON + -DBUILD_TESTS=OFF \ + -DUSE_SSH=ON %make %install