From d006782ce55e05d6fceadfee873e3c00a4852be7244f4426f3545e0464c25833 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 6 Jun 2011 09:13:55 +0000 Subject: [PATCH] Accepting request 72455 from devel:tools:scm - Do not buildrequire git, the package builds it's own git and the buildrequires line only makes backporting harder. (forwarded request 72428 from michal-m) OBS-URL: https://build.opensuse.org/request/show/72455 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=56 --- cgit.changes | 12 ++++++++++++ cgit.spec | 3 +-- git-1.7.4.2.tar.bz2 | 3 --- git-1.7.5.3.tar.bz2 | 3 +++ git.changes | 30 ++++++++++++++++++++++++++++++ git.spec | 2 +- 6 files changed, 47 insertions(+), 6 deletions(-) delete mode 100644 git-1.7.4.2.tar.bz2 create mode 100644 git-1.7.5.3.tar.bz2 diff --git a/cgit.changes b/cgit.changes index d6c6812..d9fad5f 100644 --- a/cgit.changes +++ b/cgit.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jun 1 12:41:12 UTC 2011 - mmarek@novell.com + +- Do not buildrequire git, the package builds it's own git and the + buildrequires line only makes backporting harder. + +------------------------------------------------------------------- +Fri May 27 11:54:43 CEST 2011 - tiwai@suse.de + +- updated git 1.7.5.3: + See git changelog for more details + ------------------------------------------------------------------- Mon Mar 28 18:26:17 CEST 2011 - tiwai@suse.de diff --git a/cgit.spec b/cgit.spec index f220221..ccd4f0d 100644 --- a/cgit.spec +++ b/cgit.spec @@ -17,7 +17,7 @@ # norootforbuild -%define git_version 1.7.4.2 +%define git_version 1.7.5.3 Name: cgit Url: http://hjemli.net/git/cgit/ @@ -32,7 +32,6 @@ Source1: git-%{git_version}.tar.bz2 Source2: cgitrc Patch: cgit-optflags.diff # Requirements for cgit -BuildRequires: git >= 1.7.1 BuildRequires: gnu-crypto libopenssl-devel libzip-devel # Requirements for cgitrc man page generation BuildRequires: asciidoc libxslt diff --git a/git-1.7.4.2.tar.bz2 b/git-1.7.4.2.tar.bz2 deleted file mode 100644 index 6559422..0000000 --- a/git-1.7.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e2f4aedb5cb984c7da00a18f9ffcea1c1465191dd4afe2249d5bff17ae63970 -size 2706400 diff --git a/git-1.7.5.3.tar.bz2 b/git-1.7.5.3.tar.bz2 new file mode 100644 index 0000000..fa3d784 --- /dev/null +++ b/git-1.7.5.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8017b0c624fea88bf5488d35f3839778fac3c0e089a02fe0017aea6913af3292 +size 2766856 diff --git a/git.changes b/git.changes index 04d9d7e..a998641 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Fri May 27 11:43:23 CEST 2011 - tiwai@suse.de + +- updated to 1.7.5.x: maintenance update release, see + Documentation/RelNotes/1.7.5.3.txt + Documentation/RelNotes/1.7.5.2.txt + Documentation/RelNotes/1.7.5.1.txt +- updated to 1.7.5: major version update + * Various vcs-svn, git-svn and gitk enhancements and fixes. + * Various git-gui updates (0.14.0). + * Improved bash completion script + * "git repo-config" is officially deprecated + * "git checkout" performed on detached HEAD gives a warning + * "git cherry-pick" and "git revert" can have a custom merge strategy + * "git cherry-pick" remembers which commit failed to apply when it is + stopped by conflicts + * "git cvsimport" bails out immediately when cvs server is unreachable + * "git fetch" vs "git upload-pack" transfer learned 'no-done' protocol + extension + * "git fetch" can be told to recursively fetch submodules on-demand + * "git grep -f " learned to treat "-" + * "git init" learned the --separate-git-dir option + * "git log" type commands now understand globbing pathspecs + * "git log" family of commands learned --cherry and --cherry-mark options + * "git mergetool" learned how to drive "beyond compare 3" as well + * "git rerere forget" semantic changes + * "git push" with no parameters gives better advice messages + * a new "git rerere" subcommand "remaining" + See more details in Documentation/RelNotes/1.7.5.txt + ------------------------------------------------------------------- Mon Mar 28 18:18:54 CEST 2011 - tiwai@suse.de diff --git a/git.spec b/git.spec index 3da9b38..43aeab4 100644 --- a/git.spec +++ b/git.spec @@ -38,7 +38,7 @@ BuildRequires: sgml-skel BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.4.2 +Version: 1.7.5.3 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPLv2+