diff --git a/.abf.yml b/.abf.yml index 644a3e8..ff34462 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "git-1.7.11.tar.gz": 15abe2c5b6b7cf9b738e3fb57ab9234ae02a1e61 + "git-1.7.11.2.tar.gz": f67b4f6c0277250411c6872ae7b8a872ae11d313 diff --git a/git.spec b/git.spec index 553a7fc..1c0cd9e 100644 --- a/git.spec +++ b/git.spec @@ -4,7 +4,7 @@ Name: git Epoch: 1 -Version: 1.7.11 +Version: 1.7.11.2 # 1.7.8 still builds fine in 2010.2 so keep mkrel for backports sake Release: %mkrel 1 Summary: Global Information Tracker @@ -201,6 +201,10 @@ cd Documentation/RelNotes \ %__mkdir_p %{buildroot}%{_bindir} %makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} + +# Avoid dependencies on obscure perl modules +chmod -x contrib/mw-to-git/git-remote-mediawiki + # (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 @@ -253,6 +257,7 @@ EOF # And the prompt manipulation file %__install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch} + # exposes a bug in less, as reported by coling #install -D -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/profile.d/%{profile_env} @@ -355,7 +360,15 @@ LC_ALL=C %make %{git_make_params} test NO_SVN_TESTS=true %changelog -* Fri Jun 22 2012 Bernhard Rosenkraenzer 1:1.7.11-1mdv2012.0 +* Thu Jul 12 2012 Bernhard Rosenkraenzer 1:1.7.11.2-1mdv2012.0 ++ Revision: 808970 +- Update to 1.7.11.2 + +* Tue Jun 26 2012 Bernhard Rosenkraenzer 1:1.7.11-2 ++ Revision: 806977 +- Split git-mediawiki into its own package to avoid various perl dependencies + +* Fri Jun 22 2012 Bernhard Rosenkraenzer 1:1.7.11-1 + Revision: 806699 - Update to 1.7.11 @@ -880,17 +893,3 @@ LC_ALL=C %make %{git_make_params} test NO_SVN_TESTS=true + Revision: 18240 - Release 1.5.1 - -* Sat Nov 04 2006 Stefan van der Eijk 4.3.20-13mdv2007.0 -+ Revision: 76519 -- rebuild for signature -- rebuild -- Import git - -* Wed Sep 20 2006 Nicolas Lécureuil 4.3.20-14mdv2007.0 -- Use mkrel -- Rebuild - -* Sat Dec 31 2005 Mandriva Linux Team 4.3.20-10mdk -- Rebuild -