diff --git a/completion-wordbreaks.diff b/completion-wordbreaks.diff new file mode 100644 index 0000000..ad31d00 --- /dev/null +++ b/completion-wordbreaks.diff @@ -0,0 +1,19 @@ +--- a/contrib/completion/git-completion.bash~ 2010-06-01 03:09:24.371191000 +0200 ++++ b/contrib/completion/git-completion.bash 2010-06-01 03:09:25.180182000 +0200 +@@ -54,10 +54,12 @@ + # git@vger.kernel.org + # + +-case "$COMP_WORDBREAKS" in +-*:*) : great ;; +-*) COMP_WORDBREAKS="$COMP_WORDBREAKS:" +-esac ++# SUSE-specific: We trust the system is consistent and do not let individual ++# scripts play ping-pong with the global $COMP_WORDBREAKS value. ++#case "$COMP_WORDBREAKS" in ++#*:*) : great ;; ++#*) COMP_WORDBREAKS="$COMP_WORDBREAKS:" ++#esac + + # __gitdir accepts 0 or 1 arguments (i.e., location) + # returns location of .git repo diff --git a/git-1.7.0.3.tar.bz2 b/git-1.7.0.3.tar.bz2 deleted file mode 100644 index 238b5b9..0000000 --- a/git-1.7.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f68774019b52ac462da48a5315ce1f4dcd64a2327de4a14d13014bdc0c50f841 -size 2438999 diff --git a/git-1.7.1.tar.bz2 b/git-1.7.1.tar.bz2 new file mode 100644 index 0000000..e2fc393 --- /dev/null +++ b/git-1.7.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2 +size 2475655 diff --git a/git.changes b/git.changes index 4c8a7e4..1407509 100644 --- a/git.changes +++ b/git.changes @@ -1,12 +1,35 @@ +------------------------------------------------------------------- +Tue Jun 1 02:56:35 CEST 2010 - pbaudis@suse.cz + +- Fix the git.xinetd to be disabled by default and the --base-path setting + [bnc#495060, bnc#461726] +- Fix missing dependencies of git send-email [bnc#561690] +- Fix spurious perl-Error provides [bnc#578273] +- Drop global $COMP_WORDBREAKS change from bash-completion [bnc#446506] + +------------------------------------------------------------------- +Mon Apr 26 08:26:42 CEST 2010 - tiwai@suse.de + +- updated to git 1.7.1: + including fixes in previous 1.7.0.x releases, a few new behavior + changes; see the release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.1.txt + ------------------------------------------------------------------- Thu Apr 8 23:21:51 CEST 2010 - dmueller@suse.de - require the correct perl-base version +------------------------------------------------------------------- +Thu Apr 1 13:35:17 CEST 2010 - tiwai@suse.de + +- updated to git 1.7.0.4: minor fixes + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.4.txt + ------------------------------------------------------------------- Mon Mar 22 17:30:46 CET 2010 - tiwai@suse.de -- updated to git 17.0.3: just minor fixes +- updated to git 1.7.0.3: just minor fixes http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.3.txt ------------------------------------------------------------------- diff --git a/git.spec b/git.spec index 6300188..a7e35f2 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.7.0.3) +# spec file for package git (Version 1.7.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,7 +37,8 @@ BuildRequires: libopenssl-devel BuildRequires: sgml-skel BuildRequires: xmlto BuildRequires: python -Version: 1.7.0.3 +BuildRequires: perl-Error +Version: 1.7.1 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPLv2+ @@ -49,8 +50,9 @@ Source2: sysconfig.git-daemon Source3: git-daemon.init Source4: git.xinetd Source5: usr.share.git-web.gitweb.cgi -Patch3: git-nohardlink.diff -Patch4: git-python-install-fix.diff +Patch1: git-nohardlink.diff +Patch2: git-python-install-fix.diff +Patch3: completion-wordbreaks.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} Recommends: git-svn git-cvs git-email gitk git-gui git-web @@ -77,7 +79,7 @@ Authors: License: GPLv2+ Summary: Core git tools Group: Development/Tools/Version Control -Requires: rsync, less, openssh +Requires: rsync, less, openssh, perl-Error Requires: perl-base = %{perl_version} %description core @@ -151,6 +153,8 @@ License: GPLv2+ Summary: Git tools for sending email Group: Development/Tools/Version Control Requires: git-core = %{version} +# For sending mails over secure SMTP: +Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL %description email Email interface for the GIT version control system. @@ -255,8 +259,9 @@ This package contains the building blocks for remote helpers written in Python. %prep %setup -q +%patch1 -p1 +%patch2 -p1 %patch3 -p1 -%patch4 -p1 %build cat > .make <<'EOF' @@ -433,7 +438,6 @@ fi %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } /var/adm/perl-modules/%{name} -%{perl_vendorlib}/Error.pm %{perl_vendorlib}/Git.pm %{perl_vendorarch}/auto/Git/ /etc/bash_completion.d/git.sh diff --git a/git.xinetd b/git.xinetd index 7932124..0f2061f 100644 --- a/git.xinetd +++ b/git.xinetd @@ -2,13 +2,14 @@ # description: The git server offers access to git repositories service git { + disable = yes socket_type = stream protocol = tcp wait = no user = git-daemon group = nogroup server = /usr/bin/git - server_args = daemon --syslog --inetd --base-path="/srv/git" + server_args = daemon --syslog --inetd --base-path=/srv/git type = UNLISTED port = 9418 log_on_failure += USERID