From d316ef730502f219564072fd4b4fd29dc3be8c1f Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 21 Aug 2012 23:52:28 +1100 Subject: [PATCH] LOG New version 1.7.11.3 (sync with Cooker), minor cleanups --- .abf.yml | 2 +- 93git-branch.sh | 0 93git-env.sh | 0 git.spec | 61 ++++++++++++++++++++++++++++++------------------- 4 files changed, 38 insertions(+), 25 deletions(-) mode change 100755 => 100644 93git-branch.sh mode change 100755 => 100644 93git-env.sh diff --git a/.abf.yml b/.abf.yml index 264a5de..d0c27e2 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "git-1.7.9.tar.gz": ed51ef5ef250daaa6e98515cf2641820cd268d4c + "git-1.7.11.3.tar.gz": a10c420e4d9152d6059f41825904cfac3062b135 diff --git a/93git-branch.sh b/93git-branch.sh old mode 100755 new mode 100644 diff --git a/93git-env.sh b/93git-env.sh old mode 100755 new mode 100644 diff --git a/git.spec b/git.spec index 597d7b8..6e0e304 100644 --- a/git.spec +++ b/git.spec @@ -4,23 +4,23 @@ Name: git Epoch: 1 -Version: 1.7.9 -# 1.7.8 still builds fine in 2010.2 so keep mkrel for backports sake -Release: %mkrel 1 +Version: 1.7.11.3 +Release: 2 Summary: Global Information Tracker License: GPLv2 Group: Development/Other Url: http://git-scm.com/ -Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz +Source0: http://git-core.googlecode.com/files/git-%version.tar.gz Source2: gitweb.conf Source3: %{profile_branch} # Do we really need it? It's not used anyway Source4: %{profile_env} BuildRequires: asciidoc -BuildRequires: curl-devel +BuildRequires: pkgconfig(libcurl) BuildRequires: expat-devel -BuildRequires: openssl-devel +BuildRequires: pkgconfig(openssl) BuildRequires: perl-CGI +BuildRequires: perl-devel BuildRequires: python-devel BuildRequires: xmlto BuildRequires: zlib-devel @@ -52,8 +52,6 @@ Requires: rsync Requires: less Requires: openssh-clients Suggests: git-prompt -Conflicts: git < 4.3.20-15 -Obsoletes: gitcompletion Provides: gitcompletion %description -n git-core @@ -201,9 +199,13 @@ 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 +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} @@ -253,13 +255,17 @@ 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} %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,6 +358,27 @@ LC_ALL=C %make %{git_make_params} test %changelog +* Tue Jul 24 2012 Bernhard Rosenkraenzer 1:1.7.11.3-1mdv2012.0 ++ Revision: 810878 +- Update to 1.7.11.3 + +* Thu Jul 12 2012 Bernhard Rosenkraenzer 1:1.7.11.2-1 ++ 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 + +* 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 + * Sun Jan 29 2012 Andrey Bondrov 1:1.7.9-1 + Revision: 769574 - New version 1.7.9, update file list @@ -868,17 +895,3 @@ LC_ALL=C %make %{git_make_params} test + 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 -