From 3f42f80383a4664dca73d121004a57ebbc0525588561d58c10a80cb1667dfdbc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 5 Mar 2009 15:44:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=26 --- git-1.6.1.3.tar.bz2 | 3 --- git-1.6.2.tar.bz2 | 3 +++ git-nohardlink.diff | 26 ++++++++++++++------------ git.changes | 28 ++++++++++++++++++++++++++++ git.spec | 31 ++++++++++++++++++++++++++++--- 5 files changed, 73 insertions(+), 18 deletions(-) delete mode 100644 git-1.6.1.3.tar.bz2 create mode 100644 git-1.6.2.tar.bz2 diff --git a/git-1.6.1.3.tar.bz2 b/git-1.6.1.3.tar.bz2 deleted file mode 100644 index bb8bf50..0000000 --- a/git-1.6.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682 -size 1973574 diff --git a/git-1.6.2.tar.bz2 b/git-1.6.2.tar.bz2 new file mode 100644 index 0000000..f4fd45d --- /dev/null +++ b/git-1.6.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635 +size 2016213 diff --git a/git-nohardlink.diff b/git-nohardlink.diff index e6bdfe1..3ad6b69 100644 --- a/git-nohardlink.diff +++ b/git-nohardlink.diff @@ -1,14 +1,16 @@ don't use hardlinks as our .spec calls fdupes which converts the hardlinks to symlinks again in an unpredicatable way -Index: git-1.6.0.2/Makefile -=================================================================== ---- git-1.6.0.2.orig/Makefile -+++ git-1.6.0.2/Makefile -@@ -1371,7 +1371,6 @@ endif - ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \ - cp git-add$X "$$execdir/git-add$X"; } && \ - { $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \ -- ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \ - ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \ - cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \ - ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +--- a/Makefile ++++ b/Makefile +@@ -1472,7 +1472,6 @@ + cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \ + { for p in $(filter-out git-add$X,$(BUILT_INS)); do \ + $(RM) "$$execdir/$$p" && \ +- ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \ + done } && \ diff --git a/git.changes b/git.changes index 9f882a2..dd98a84 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Mar 5 12:24:45 CET 2009 - tiwai@suse.de + +- updated to 1.6.2: + * @{-1} is a way to refer to the last branch you were on. + * The location of .mailmap file can be configured + * Improvements on "git add -p" + * Improvements on "git am" behavior and options + * "git blame" aligns author names better + * "git clone" now makes its best effort when cloning from an + empty repository + * "git checkout -" is a shorthand for "git checkout @{-1}". + * "git cherry" defaults to whatever the current branch is + tracking (if exists) when the argument is not given. + * "git cvsserver" fixes / improvements + * New options for "git diff" + * New options for "git filter-branch" + * "git fsck" now checks loose objects in alternate object + stores + * "git gc --prune" was resurrected to allow "git gc --no-prune" + * New option for "git mergetool" + * "git rebase -i" can transplant a history down to root + * "git reset --merge" option + * "git submodule update" learned --no-fetch option. + * "git tag" learned --contains + For more details, see + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.2.txt + ------------------------------------------------------------------- Mon Feb 9 08:27:53 CET 2009 - tiwai@suse.de diff --git a/git.spec b/git.spec index 543e49e..4a3b1e2 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.6.1.3) +# spec file for package git (Version 1.6.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,12 +36,12 @@ BuildRequires: libopenssl-devel %endif BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.6.1.3 +Version: 1.6.2 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control -Url: http://git.or.cz +Url: http://git-scm.com Source0: http://kernel.org/pub/software/scm/git/%name-%{version}.tar.bz2 Source1: apache2-gitweb.conf Source2: sysconfig.git-daemon @@ -420,6 +420,31 @@ fi /etc/bash_completion.d/git.sh %changelog +* Thu Mar 05 2009 tiwai@suse.de +- updated to 1.6.2: + * @{-1} is a way to refer to the last branch you were on. + * The location of .mailmap file can be configured + * Improvements on "git add -p" + * Improvements on "git am" behavior and options + * "git blame" aligns author names better + * "git clone" now makes its best effort when cloning from an + empty repository + * "git checkout -" is a shorthand for "git checkout @{-1}". + * "git cherry" defaults to whatever the current branch is + tracking (if exists) when the argument is not given. + * "git cvsserver" fixes / improvements + * New options for "git diff" + * New options for "git filter-branch" + * "git fsck" now checks loose objects in alternate object + stores + * "git gc --prune" was resurrected to allow "git gc --no-prune" + * New option for "git mergetool" + * "git rebase -i" can transplant a history down to root + * "git reset --merge" option + * "git submodule update" learned --no-fetch option. + * "git tag" learned --contains + For more details, see + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.2.txt * Mon Feb 09 2009 tiwai@suse.de - updated to 1.6.1.3: * "git diff --binary | git apply" pipeline did not work well