diff --git a/git-1.7.9.2.tar.gz b/git-1.7.9.2.tar.gz new file mode 100644 index 0000000..7778ec5 --- /dev/null +++ b/git-1.7.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75 +size 3611846 diff --git a/git-1.7.9.tar.gz b/git-1.7.9.tar.gz deleted file mode 100644 index 462471a..0000000 --- a/git-1.7.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd9dfcf1da59f09c4b66b53836b56fcb2208d0be9edf1f8b9079c7e980435086 -size 3606326 diff --git a/git.changes b/git.changes index 61a6dc7..a866368 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Mon Feb 27 11:43:15 UTC 2012 - saschpe@suse.de + +- Update to version 1.7.9.2: + * Bash completion script (in contrib/) did not like a pattern that + begins with a dash to be passed to __git_ps1 helper function. + * Adaptation of the bash completion script (in contrib/) for zsh + incorrectly listed all subcommands when "git " was given + to ask for list of porcelain subcommands. + * The build procedure for profile-directed optimized binary was not + working very well. + * Some systems need to explicitly link -lcharset to get locale_charset(). + * t5541 ignored user-supplied port number used for HTTP server testing. + * The error message emitted when we see an empty loose object was + not phrased correctly. + * The code to ask for password did not fall back to the terminal + input when GIT_ASKPASS is set but does not work (e.g. lack of X + with GUI askpass helper). + * We failed to give the true terminal width to any subcommand when + they are invoked with the pager, i.e. "git -p cmd". + * map_user() was not rewriting its output correctly, which resulted + in the user visible symptom that "git blame -e" sometimes showed + excess '>' at the end of email addresses. + * "git checkout -b" did not allow switching out of an unborn branch. + * When you have both .../foo and .../foo.git, "git clone .../foo" did not + favor the former but the latter. + * "git commit" refused to create a commit when entries added with + "add -N" remained in the index, without telling Git what their content + in the next commit should be. We should have created the commit without + these paths. + * "git diff --stat" said "files", "insertions", and "deletions" even + when it is showing one "file", one "insertion" or one "deletion". + * The output from "git diff --stat" for two paths that have the same + amount of changes showed graph bars of different length due to the + way we handled rounding errors. + * "git grep" did not pay attention to -diff (hence -binary) attribute. + * The transport programs (fetch, push, clone)ignored --no-progress + and showed progress when sending their output to a terminal. + * Sometimes error status detected by a check in an earlier phase of + "git receive-pack" (the other end of "git push") was lost by later + checks, resulting in false indication of success. + * "git rev-list --verify" sometimes skipped verification depending on + the phase of the moon, which dates back to 1.7.8.x series. + * Search box in "gitweb" did not accept non-ASCII characters correctly. + * Search interface of "gitweb" did not show multiple matches in the same file + correctly. + ------------------------------------------------------------------- Thu Feb 9 10:04:38 CET 2012 - tiwai@suse.de diff --git a/git.spec b/git.spec index 02448e0..98303ec 100644 --- a/git.spec +++ b/git.spec @@ -19,28 +19,17 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git -%if 0%{?suse_version} < 1030 -%define dist_has_fdupes 0 -%else -%define dist_has_fdupes 1 -%endif BuildRequires: asciidoc BuildRequires: curl BuildRequires: libcurl-devel BuildRequires: libexpat-devel -%if %{dist_has_fdupes} BuildRequires: fdupes -%endif -%if 0%{?suse_version} < 1030 -BuildRequires: openssl-devel -%else BuildRequires: libopenssl-devel -%endif BuildRequires: sgml-skel BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.9 +Version: 1.7.9.2 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 @@ -74,12 +63,6 @@ including GTK and email interfaces and tools for importing source code repositories from other revision control systems such as subversion, CVS, and GNU arch. - - -Authors: --------- - Linus Torvalds - %package core Summary: Core git tools Group: Development/Tools/Version Control @@ -93,13 +76,6 @@ full access to internals. These are the core tools with minimal dependencies. - - -Authors: --------- - Linus Torvalds - Junio C Hamano - %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools/Version Control @@ -110,13 +86,6 @@ Requires: subversion-perl Tools for importing Subversion repositories to the Git version control system. - - -Authors: --------- - Linus Torvalds - Junio C Hamano - %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools/Version Control @@ -125,13 +94,6 @@ Requires: git-core = %{version}, cvs, cvsps, perl-DBD-SQLite %description cvs Tools for importing CVS repositories to the Git version control system. - - -Authors: --------- - Linus Torvalds - Junio C Hamano - %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools/Version Control @@ -142,13 +104,6 @@ Requires: git-core = %{version} Tools for importing GNU Arch repositories to the GIT version control system. - - -Authors: --------- - Linus Torvalds - Junio C Hamano - %package email Summary: Git tools for sending email Group: Development/Tools/Version Control @@ -159,13 +114,6 @@ Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL %description email Email interface for the GIT version control system. - - -Authors: --------- - Linus Torvalds - Junio C Hamano - %package daemon Summary: Simple Server for Git Repositories Group: Development/Tools/Version Control @@ -176,13 +124,6 @@ PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq A really simple TCP git daemon. In the default configuration it allows read only access to repositories in /srv/git/ that contain the 'git-daemon-export-ok' file. - - - -Authors: --------- - Linus Torvalds - %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools/Version Control @@ -197,13 +138,6 @@ that it's written using the Tk Widget set. A simple Tk based graphical interface for common Git operations is found in the package git-gui. - - -Authors: --------- - Linus Torvalds - Junio C Hamano - %package gui Summary: Grapical tool for common git operations Group: Development/Tools/Version Control @@ -220,12 +154,6 @@ Unlike gitk, git-gui focuses on commit generation and single file annotation, and does not show project history. It does however supply menu actions to start a gitk session from within git-gui. - - -Authors: --------- - Linus Torvalds - %package web Summary: Git Web Interface Group: Development/Tools/Version Control @@ -238,12 +166,6 @@ CGI script that allows browsing git repositories via web interface. The apache2 configuration contained in this package installs a virtual directory /git/ that calls the cgi script. - - -Authors: --------- - Linus Torvalds - %package remote-helpers Summary: Python package for remote helper scripts Group: Development/Tools/Version Control @@ -284,8 +206,8 @@ chmod 755 .make ### git-web cp gitweb/INSTALL INSTALL.gitweb cp gitweb/README README.gitweb -install -d ${RPM_BUILD_ROOT}/usr/share/git-web -install -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d +install -d %{buildroot}/usr/share/git-web +install -d %{buildroot}/etc/apache2/conf.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf ### git-daemon install -d -m 755 $RPM_BUILD_ROOT/etc/init.d @@ -305,9 +227,9 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl perl Makefile.PL - make -f perl.mak DESTDIR=${RPM_BUILD_ROOT} install_vendor + make -f perl.mak DESTDIR=%{buildroot} install_vendor ) -rm -rf ${RPM_BUILD_ROOT}/usr/lib/perl5/site_perl +rm -rf %{buildroot}/usr/lib/perl5/site_perl %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh @@ -317,7 +239,6 @@ install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bas install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d # -%if %{dist_has_fdupes} # create predictable symlinks to make apparmor profile work for i in git git-upload-archive; do rm $RPM_BUILD_ROOT%{_bindir}/$i @@ -330,7 +251,6 @@ fi %find_lang %{name} # use symlinks instead of hardlinks in sub-commands %fdupes -s $RPM_BUILD_ROOT -%endif %check make %{?_smp_mflags} test