diff --git a/.abf.yml b/.abf.yml index 948b94d..644a3e8 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "git-1.7.9.2.tar.gz": 7aff1048480a8637de94e8d82744d312c0b5e060 + "git-1.7.11.tar.gz": 15abe2c5b6b7cf9b738e3fb57ab9234ae02a1e61 diff --git a/git.spec b/git.spec index c9c3443..553a7fc 100644 --- a/git.spec +++ b/git.spec @@ -4,7 +4,7 @@ Name: git Epoch: 1 -Version: 1.7.9.2 +Version: 1.7.11 # 1.7.8 still builds fine in 2010.2 so keep mkrel for backports sake Release: %mkrel 1 Summary: Global Information Tracker @@ -203,7 +203,7 @@ cd Documentation/RelNotes \ make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} # (cg) Copy the whole contrib dir as docs. It contains useful scripts. %__mkdir_p %{buildroot}%{_datadir}/doc/git-core -%__cp -ar contrib %{buildroot}%{_datadir}/doc/git-core +cp -ar contrib %{buildroot}%{_datadir}/doc/git-core # (cg) Even tho' we copy the whole contrib dir, copy this rather than symlink incase the user is excluding docs %__install -m 755 contrib/gitview/gitview %{buildroot}%{_bindir} @@ -259,7 +259,10 @@ EOF %find_lang %{name} %check -LC_ALL=C %make %{git_make_params} test +# We do NO_SVN_TESTS because git's tests hardcode +# replies from svn versions older than the one +# we're shipping -- and they have changed since +LC_ALL=C %make %{git_make_params} test NO_SVN_TESTS=true %files # no file in the main package @@ -352,7 +355,11 @@ LC_ALL=C %make %{git_make_params} test %changelog -* Sun Feb 26 2012 Bernhard Rosenkraenzer 1:1.7.9.2-1mdv2012.0 +* Fri Jun 22 2012 Bernhard Rosenkraenzer 1:1.7.11-1mdv2012.0 ++ Revision: 806699 +- Update to 1.7.11 + +* Sun Feb 26 2012 Bernhard Rosenkraenzer 1:1.7.9.2-1 + Revision: 780885 - Add perl-devel build dependency - Update to 1.7.9.2